19 files changed, 33258 insertions, 30988 deletions

diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 0947f749f..bacf8a0ae 100644
--- a/nova/locale/bs/LC_MESSAGES/nova.po
+++ b/nova/locale/bs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2012-01-19 20:22+0000\n"
 "Last-Translator: yazar  <zrncescientiae@gmail.com>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -121,198 +126,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -320,618 +334,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1057,6 +1062,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1089,193 +1099,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1315,6 +1329,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1348,97 +1367,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1452,170 +1471,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1684,36 +1763,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1782,12 +1871,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1843,7 +1932,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1860,20 +1949,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1883,8 +1972,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1961,179 +2050,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2172,7 +2264,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2205,8 +2297,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2224,46 +2316,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2296,8 +2388,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2317,8 +2409,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2360,11 +2452,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2461,11 +2553,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2483,27 +2570,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2517,82 +2599,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2616,7 +2622,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2633,133 +2639,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2785,117 +2791,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2947,453 +2958,455 @@ msgstr ""
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
+#: nova/compute/manager.py:699
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:708
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
 #, python-format
-msgid "terminating bdm %s"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3468,31 +3481,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3505,11 +3518,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3517,6 +3525,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3575,74 +3584,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3665,94 +3678,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3760,41 +3787,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3802,68 +3829,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3878,7 +3905,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3888,7 +3915,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3898,7 +3925,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3931,42 +3958,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3989,15 +4016,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4007,7 +4034,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4019,56 +4046,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4084,119 +4111,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4206,30 +4241,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4254,182 +4265,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4486,34 +4450,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4576,27 +4540,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4605,19 +4561,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4652,11 +4605,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4711,77 +4659,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4805,21 +4713,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4855,40 +4763,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5071,7 +4969,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5093,7 +4991,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5108,8 +5006,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5134,44 +5032,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5217,170 +5129,166 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5390,35 +5298,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5437,148 +5350,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5587,29 +5501,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5728,260 +5642,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6016,27 +5930,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6050,16 +5964,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6089,27 +6003,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6126,437 +6040,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6590,276 +6493,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6892,7 +6795,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6909,7 +6812,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6932,160 +6835,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7125,7 +7014,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7134,59 +7023,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "Status volumena mora biti omogućen"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7220,74 +7110,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7313,83 +7135,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7455,102 +7277,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7629,11 +7455,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7714,144 +7540,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7870,6 +7655,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7881,12 +7685,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7895,6 +7835,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7904,12 +7853,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7925,3 +7935,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index bf914de8e..ab6d23e8b 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-08-23 11:22+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -18,7 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -122,198 +127,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "Není metoda pro zpracování zprávy: %s"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -321,618 +335,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1058,6 +1063,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1090,193 +1100,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1316,6 +1330,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1349,97 +1368,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1453,170 +1472,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1685,36 +1764,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1783,12 +1872,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1844,7 +1933,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1861,20 +1950,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1884,8 +1973,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1962,179 +2051,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2173,7 +2265,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2206,8 +2298,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2225,46 +2317,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2297,8 +2389,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2318,8 +2410,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2361,11 +2453,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2462,11 +2554,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2484,27 +2571,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2518,82 +2600,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2617,7 +2623,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2634,133 +2640,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2786,117 +2792,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2948,453 +2959,455 @@ msgstr ""
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
+#: nova/compute/manager.py:699
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:708
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
 #, python-format
-msgid "terminating bdm %s"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3469,31 +3482,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3506,11 +3519,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3518,6 +3526,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3576,74 +3585,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3666,94 +3679,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3761,41 +3788,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3803,68 +3830,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3879,7 +3906,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3889,7 +3916,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3899,7 +3926,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3932,42 +3959,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3990,15 +4017,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4008,7 +4035,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4020,56 +4047,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Volajícímu je vrácena výjimka: %s"
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr "rozbalený obsah: %s"
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "získáno: %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "Není metoda pro zpracování zprávy: %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "Není metoda pro zpracování zprávy: %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID je %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4085,119 +4112,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "Znovu připojeno k AMQP frontě"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "odpověď %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "zpráva %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4207,30 +4242,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4255,182 +4266,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4487,34 +4451,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4577,27 +4541,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4606,19 +4562,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4653,11 +4606,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4712,77 +4660,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4806,21 +4714,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4856,40 +4764,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5072,7 +4970,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5094,7 +4992,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5109,8 +5007,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5135,44 +5033,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5218,170 +5130,166 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5391,35 +5299,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5438,148 +5351,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5588,29 +5502,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5729,260 +5643,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6017,27 +5931,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6051,16 +5965,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6090,27 +6004,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6127,437 +6041,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6591,276 +6494,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6893,7 +6796,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6910,7 +6813,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6933,160 +6836,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7126,7 +7015,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7135,59 +7024,59 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+msgid "Volume status must be available or error"
 msgstr ""
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7221,74 +7110,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7314,83 +7135,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7457,102 +7278,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7631,11 +7456,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7716,144 +7541,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7872,6 +7656,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7883,12 +7686,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7897,6 +7836,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7906,12 +7854,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7927,3 +7936,133 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "Volume status must be available"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index e548592e6..a0f03a65e 100644
--- a/nova/locale/da/LC_MESSAGES/nova.po
+++ b/nova/locale/da/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-01-15 21:46+0000\n"
 "Last-Translator: Soren Hansen <soren@linux2go.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -121,198 +126,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -320,618 +334,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1057,6 +1062,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1089,193 +1099,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1315,6 +1329,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1348,97 +1367,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1452,170 +1471,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1684,36 +1763,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1782,12 +1871,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1843,7 +1932,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1860,20 +1949,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1883,8 +1972,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1961,179 +2050,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2172,7 +2264,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2205,8 +2297,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2224,46 +2316,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2296,8 +2388,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2317,8 +2409,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2360,11 +2452,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2461,11 +2553,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2483,27 +2570,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2517,82 +2599,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2616,7 +2622,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2633,133 +2639,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2785,117 +2791,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2947,453 +2958,455 @@ msgstr ""
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
+#: nova/compute/manager.py:699
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:708
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
 #, python-format
-msgid "terminating bdm %s"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3468,31 +3481,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3505,11 +3518,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3517,6 +3525,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3575,74 +3584,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3665,94 +3678,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3760,41 +3787,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3802,68 +3829,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3878,7 +3905,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3888,7 +3915,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3898,7 +3925,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3931,42 +3958,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3989,15 +4016,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4007,7 +4034,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4019,56 +4046,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4084,119 +4111,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4206,30 +4241,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4254,182 +4265,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4486,34 +4450,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4576,27 +4540,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4605,19 +4561,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4652,11 +4605,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4711,77 +4659,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4805,21 +4713,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4855,40 +4763,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5071,7 +4969,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5093,7 +4991,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5108,8 +5006,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5134,44 +5032,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5217,171 +5129,167 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "bind %s: slettet"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5391,35 +5299,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5438,148 +5351,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5588,29 +5502,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5729,260 +5643,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6017,27 +5931,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6051,16 +5965,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6090,27 +6004,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6127,437 +6041,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6591,276 +6494,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6893,7 +6796,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6910,7 +6813,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6933,160 +6836,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7126,7 +7015,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7135,59 +7024,59 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+msgid "Volume status must be available or error"
 msgstr ""
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7221,74 +7110,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7314,83 +7135,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "bind %s: slettet"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7456,102 +7277,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7630,11 +7455,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7715,144 +7540,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7871,6 +7655,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7882,12 +7685,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7896,6 +7835,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7905,12 +7853,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7926,3 +7935,133 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "Volume status must be available"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 36e4c59c8..391402262 100644
--- a/nova/locale/de/LC_MESSAGES/nova.po
+++ b/nova/locale/de/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-08-23 11:23+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -126,198 +131,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "keine Methode für diese Nachricht gefunden: %s"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -325,618 +339,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1062,6 +1067,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1094,193 +1104,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr "Das Service-Datenbank-Objekt ist verschwunden, es wird erneut erzeugt."
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr "Alle vorhandenen FLAGS:"
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr "Hole %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Führe Kommando (subprocess) aus: %s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "Ergebnis war %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1320,6 +1334,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1353,97 +1372,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1457,170 +1476,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1689,36 +1768,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1787,12 +1876,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1848,7 +1937,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1865,20 +1954,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1888,8 +1977,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1966,179 +2055,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2177,7 +2269,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2210,8 +2302,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2229,46 +2321,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2301,8 +2393,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2322,8 +2414,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2365,11 +2457,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2466,11 +2558,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2488,27 +2575,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2522,82 +2604,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2621,7 +2627,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2638,133 +2644,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Verwende Project-Name = User-Name (%s)"
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2790,117 +2796,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2952,453 +2963,455 @@ msgstr ""
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "Instanz wurde bereits erstellt"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
+#: nova/compute/manager.py:699
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:708
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
 #, python-format
-msgid "terminating bdm %s"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr "Instanz %s pausiert"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr "Instanz %s wird fortgesetzt"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3473,31 +3486,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3510,11 +3523,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3522,6 +3530,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3580,74 +3589,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3670,94 +3683,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3765,41 +3792,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3807,68 +3834,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3883,7 +3910,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3893,7 +3920,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3903,7 +3930,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3936,42 +3963,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3994,15 +4021,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4012,7 +4039,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4024,56 +4051,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID ist %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4089,119 +4116,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr "Betreff ist %s"
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "Nachricht %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4211,30 +4246,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4259,182 +4270,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4491,34 +4455,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4581,27 +4545,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4610,19 +4566,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4657,11 +4610,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4716,77 +4664,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "Konnte Verbindung zum Hypervisor nicht öffnen"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4810,21 +4718,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4860,40 +4768,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5076,7 +4974,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5098,7 +4996,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5113,8 +5011,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5139,44 +5037,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5222,171 +5134,167 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5396,35 +5304,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5443,148 +5356,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5593,29 +5507,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5734,260 +5648,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6022,27 +5936,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6056,16 +5970,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6095,27 +6009,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6132,437 +6046,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6596,276 +6499,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6898,7 +6801,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6915,7 +6818,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6938,160 +6841,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7131,7 +7020,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7140,59 +7029,59 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+msgid "Volume status must be available or error"
 msgstr ""
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7226,74 +7115,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7319,83 +7140,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "Volume %s: erstelle Export"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr "Volume %s: entferne Export"
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr "Volume %s: wird entfernt"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "Volume %s: erfolgreich entfernt"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7461,102 +7282,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7635,11 +7460,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7720,144 +7545,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7876,6 +7660,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7887,12 +7690,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7901,6 +7840,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7910,12 +7858,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7931,3 +7940,133 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "Volume status must be available"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index 7d077182e..52cf4e240 100644
--- a/nova/locale/en_AU/LC_MESSAGES/nova.po
+++ b/nova/locale/en_AU/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-10-21 11:27+0000\n"
 "Last-Translator: Tom Fifield <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -126,198 +131,208 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "no method for message: %s"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+#, fuzzy
+msgid "Failed to terminate instance"
+msgstr "Going to start terminating instances"
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -325,618 +340,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "User %(uid)s is already a member of the group %(group_dn)s"
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1062,6 +1068,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, fuzzy, python-format
+msgid "Could not fetch image %(image)s"
+msgstr "Could not attach image to loopback: %s"
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1094,193 +1105,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "Starting %(topic)s node (version %(vcs_string)s)"
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr "Service killed that has no database entry"
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr "The service database object disappeared, Recreating it."
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr "Recovered model server connection!"
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr "model server went away"
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Inner Exception: %s"
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1320,6 +1335,11 @@ msgstr "not available"
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1355,97 +1375,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Authentication Failure: %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "Authenticated Request For %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Unauthorised request for controller=%(controller)s and action=%(action)s"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, fuzzy, python-format
 msgid "ValidatorError raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "An unknown error has occurred. Please try your request again."
 
@@ -1459,170 +1479,231 @@ msgstr "Unsupported API request: controller = %(controller)s, action = %(action)
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr "Revoke security group ingress %s"
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, fuzzy, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr "Not enough parameters to build a valid rule."
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr "Authorise security group ingress %s"
+
+#: nova/api/ec2/cloud.py:723
+#, fuzzy, python-format
+msgid "%s - This rule already exists in group"
+msgstr "This rule already exists in group %s"
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr "group %s already exists"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+#, fuzzy, python-format
+msgid "Detach Volume Failed."
+msgstr "Detach volume %s"
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute not supported: %s"
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr "Allocate address"
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Release address %s"
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr "Failed to get metadata for ip: %s"
@@ -1691,36 +1772,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1789,12 +1880,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1850,7 +1941,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1867,20 +1958,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1890,8 +1981,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1968,179 +2059,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2179,7 +2273,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2212,8 +2306,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2231,46 +2325,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2303,8 +2397,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2324,8 +2418,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2367,11 +2461,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2469,11 +2563,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr "Authorise security group ingress %s"
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr "Not enough parameters to build a valid rule."
@@ -2491,27 +2580,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr "Revoke security group ingress %s"
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2525,82 +2609,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2624,7 +2632,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2643,27 +2651,27 @@ msgstr ""
 "Attempted to remove the last member of a group. Deleting the group at %s "
 "instead."
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Looking up user: %r"
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Failed authorisation for access key %s"
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Using project name = user name (%s)"
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr "failed authorisation: no project named %(pjid)s (user=%(uname)s)"
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
@@ -2672,106 +2680,106 @@ msgstr ""
 "Failed authorisation: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Invalid signature for user %s"
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr "Must specify project"
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "Adding role %(role)s to user %(uid)s in project %(pid)s"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr "Adding sitewide role %(role)s to user %(uid)s"
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr "Removing role %(role)s from user %(uid)s on project %(pid)s"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr "Removing sitewide role %(role)s from user %(uid)s"
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "Created project %(name)s with manager %(manager_user)s"
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr "modifying project %s"
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Adding user %(uid)s to project %(pid)s"
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Remove user %(uid)s from project %(pid)s"
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr "Deleting project %s"
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "Created user %(rvname)s (admin: %(rvadmin)r)"
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr "Deleting user %s"
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "Access Key change for user %s"
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "Secret Key change for user %s"
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "Admin status set to %(admin)r for user %(uid)s"
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "No vpn data for project %s"
@@ -2798,121 +2806,127 @@ msgstr "Netmask to push into openvpn config"
 msgid "Launching VPN for %s"
 msgstr "Launching VPN for %s"
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
-msgstr ""
+#: nova/compute/api.py:257
+#, fuzzy, python-format
+msgid "Cannot run any more instances of this type."
+msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
-msgstr ""
+#: nova/compute/api.py:259
+#, fuzzy, python-format
+msgid "Can only run %s more instances of this type."
+msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
-msgstr "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
+msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr "Creating a raw instance"
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2964,453 +2978,455 @@ msgstr "check_instance_lock: not executing |%s|"
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
-#, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
-msgstr ""
+#: nova/compute/manager.py:406
+#, fuzzy, python-format
+msgid "Exception encountered while terminating the instance %s"
+msgstr "After terminating instances: %s"
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "Instance has already been created"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "trying to destroy already destroyed instance: %s"
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr "instance %s: rescuing"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr "instance %s: unrescuing"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr "instance %s: pausing"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr "instance %s: unpausing"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr "instance %s: suspending"
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr "instance %s: resuming"
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr "instance %s: locking"
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr "instance %s: unlocking"
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr "instance %s: getting locked state"
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3485,31 +3501,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr "Use of empty request context is deprecated"
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3522,11 +3538,6 @@ msgstr "python-migrate is not installed. Exiting."
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3534,6 +3545,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3592,74 +3604,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Failed to decrypt initialisation vector: %s"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Failed to decrypt image file %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3682,94 +3698,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Starting VLAN inteface %s"
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, fuzzy, python-format
+msgid "Starting bridge %s "
+msgstr "Starting Bridge interface for %s"
+
+#: nova/network/linux_net.py:1145
+#, fuzzy, python-format
+msgid "Done starting bridge %s"
+msgstr "Error starting xvp: %s"
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3777,41 +3807,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3819,62 +3849,62 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -3882,7 +3912,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3897,7 +3927,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3907,7 +3937,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3917,7 +3947,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3950,42 +3980,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -4008,15 +4038,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4026,7 +4056,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4038,56 +4068,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Returning exception %s to caller"
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr "unpacked context: %s"
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "received %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "no method for message: %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "No method for message: %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID is %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4103,119 +4133,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "Reconnected to queue"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr "Initing the Adapter Consumer for %s"
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "response %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr "topic is %s"
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "message %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4225,30 +4263,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4273,182 +4287,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr "Must implement a fallback schedule"
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4505,34 +4472,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4595,27 +4562,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4624,19 +4583,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4671,11 +4627,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4730,77 +4681,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested return %s"
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "Failed to open connection to the hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4824,21 +4735,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4874,7 +4785,7 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -4884,33 +4795,23 @@ msgstr ""
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr "Task [%(name)s] %(task)s status: success    %(result)s"
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
@@ -5093,7 +4994,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr "instance %s: Creating image"
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5117,7 +5018,7 @@ msgstr "instance %s: starting toXML method"
 msgid "instance %s: finished toXML method"
 msgstr "instance %s: finished toXML method"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5132,8 +5033,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5158,44 +5059,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "Failed to mount filesystem: %s"
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5241,171 +5156,167 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "nbd device %s did not show up"
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: rebooted"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr "virsh said: %r"
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr "cool, it's a device"
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5415,35 +5326,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5462,148 +5378,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr "Unable to find an open port"
 
@@ -5612,29 +5529,29 @@ msgstr "Unable to find an open port"
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5753,260 +5670,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6041,27 +5958,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Calling %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6077,16 +5994,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6116,27 +6033,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6153,49 +6070,62 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr "Created VM %s..."
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr "Created VM %(instance_name)s as %(vm_ref)s."
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
+msgid "VBD not found in instance %s"
+msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:251
-#, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:265
+#, fuzzy, python-format
+msgid "VBD %s already detached"
+msgstr "group %s already exists"
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
-msgstr "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, fuzzy, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6204,231 +6134,243 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -6437,157 +6379,121 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr "Creating VBD for VDI %s ... "
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr "Creating VBD for VDI %s done."
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr "VBD.unplug successful first time."
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr "VBD.unplug rejected: retrying..."
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr "VBD.unplug successful eventually."
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr "Ignoring XenAPI.Failure in VBD.unplug: %s"
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr "Ignoring XenAPI.Failure %s"
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6621,276 +6527,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr "instance %s: Failed to spawn"
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr "Starting VM %s..."
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr "Finished snapshot and upload for VM %s"
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk files removed"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -6923,7 +6829,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "Introduced %(label)s as %(sr_ref)s."
@@ -6940,7 +6846,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6963,160 +6869,146 @@ msgstr "Introducing %s..."
 msgid "Unable to find SR from VBD %s"
 msgstr "Unable to find SR from VBD %s"
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr "Unable to introduce VDI on SR %s"
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr "Unable to get record of VDI %s on"
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr "Unable to introduce VDI for SR %s"
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Mountpoint cannot be translated: %s"
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
@@ -7156,7 +7048,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7165,59 +7057,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "Volume status must be available"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "Recovering from a failed execute.  Try number %s"
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "volume group %s doesn't exist"
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr "Could not find iSCSI export  for volume %s"
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7251,74 +7144,6 @@ msgstr "Sheepdog is not working"
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7344,83 +7169,83 @@ msgstr "volume %(vol_name)s: creating logical volume of size %(vol_size)sG"
 msgid "volume %s: creating export"
 msgstr "volume %s: creating export"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr "Volume is still attached"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr "Volume is not local to this node"
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: snapshotting"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7487,102 +7312,106 @@ msgstr "Failed to get metadata for ip: %s"
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7661,11 +7490,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7746,144 +7575,97 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
-
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7899,6 +7681,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "trying to destroy already destroyed instance: %s"
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7910,12 +7711,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr "Task [%(name)s] %(task)s status: success    %(result)s"
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7924,6 +7861,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr "virsh said: %r"
+
+#~ msgid "cool, it's a device"
+#~ msgstr "cool, it's a device"
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7933,12 +7879,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr "Creating VBD for VDI %s ... "
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr "Creating VBD for VDI %s done."
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr "VBD.unplug successful first time."
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr "VBD.unplug rejected: retrying..."
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr "VBD.unplug successful eventually."
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr "Ignoring XenAPI.Failure in VBD.unplug: %s"
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr "Ignoring XenAPI.Failure %s"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
@@ -7951,3 +7958,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index 0614884ea..3ef552023 100644
--- a/nova/locale/en_GB/LC_MESSAGES/nova.po
+++ b/nova/locale/en_GB/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-06-19 18:14+0000\n"
 "Last-Translator: Dave Walker <davewalker@ubuntu.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -126,198 +131,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -325,618 +339,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1062,6 +1067,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1094,193 +1104,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr "Full set of FLAGS:"
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Inner Exception: %s"
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1320,6 +1334,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1353,97 +1372,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1457,170 +1476,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1689,36 +1768,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1787,12 +1876,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1848,7 +1937,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1865,20 +1954,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1888,8 +1977,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1966,179 +2055,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2177,7 +2269,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2210,8 +2302,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2229,46 +2321,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2301,8 +2393,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2322,8 +2414,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2365,11 +2457,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2466,11 +2558,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2488,27 +2575,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2522,82 +2604,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2621,7 +2627,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2638,133 +2644,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2791,117 +2797,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2953,453 +2964,455 @@ msgstr "check_instance_lock: not executing |%s|"
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:406
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:404
-#, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
-msgstr ""
-
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "Instance has already been created"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "trying to destroy already destroyed instance: %s"
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr "instance %s: rescuing"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr "instance %s: pausing"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr "instance %s: suspending"
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr "instance %s: resuming"
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr "instance %s: locking"
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr "instance %s: unlocking"
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr "instance %s: getting locked state"
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3474,31 +3487,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr "Use of empty request context is deprecated"
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3511,11 +3524,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3523,6 +3531,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3581,74 +3590,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3671,94 +3684,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Starting VLAN inteface %s"
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, fuzzy, python-format
+msgid "Starting bridge %s "
+msgstr "Starting Bridge interface for %s"
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3766,41 +3793,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3808,68 +3835,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3884,7 +3911,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3894,7 +3921,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3904,7 +3931,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3937,42 +3964,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3995,15 +4022,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4013,7 +4040,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4025,56 +4052,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4090,119 +4117,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4212,30 +4247,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4260,182 +4271,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
-#, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "_filter_hosts: %(request_spec)s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:239
-#, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4492,34 +4456,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4582,27 +4546,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4611,19 +4567,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4658,11 +4611,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4717,77 +4665,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested return %s"
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "Failed to open connection to the hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4811,21 +4719,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4861,40 +4769,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5077,7 +4975,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5099,7 +4997,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5114,8 +5012,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5140,44 +5038,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5223,171 +5135,167 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: created successfully"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5397,35 +5305,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5444,148 +5357,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5594,29 +5508,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5735,260 +5649,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6023,27 +5937,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Calling %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6059,16 +5973,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6098,27 +6012,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6135,49 +6049,62 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr "Created VM %s..."
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr "Created VM %(instance_name)s as %(vm_ref)s."
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
+msgid "VBD not found in instance %s"
+msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
-msgstr "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, fuzzy, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6186,231 +6113,243 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -6419,157 +6358,121 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr "Creating VBD for VDI %s ... "
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr "Creating VBD for VDI %s done."
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr "VBD.unplug successful first time."
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr "VBD.unplug rejected: retrying..."
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr "VBD.unplug successful eventually."
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr "Ignoring XenAPI.Failure in VBD.unplug: %s"
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr "Ignoring XenAPI.Failure %s"
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6603,276 +6506,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr "instance %s: Failed to spawn"
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6905,7 +6808,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6922,7 +6825,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6945,160 +6848,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
@@ -7138,7 +7027,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7147,59 +7036,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "Volume status must be available"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7233,74 +7123,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7326,83 +7148,83 @@ msgstr "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgid "volume %s: creating export"
 msgstr "volume %s: creating export"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr "Volume is still attached"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr "Volume is not local to this node"
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: snapshotting"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7468,102 +7290,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7642,11 +7468,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7727,144 +7553,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7883,6 +7668,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "trying to destroy already destroyed instance: %s"
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7894,12 +7698,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7908,6 +7848,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7917,12 +7866,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr "Creating VBD for VDI %s ... "
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr "Creating VBD for VDI %s done."
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr "VBD.unplug successful first time."
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr "VBD.unplug rejected: retrying..."
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr "VBD.unplug successful eventually."
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr "Ignoring XenAPI.Failure in VBD.unplug: %s"
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr "Ignoring XenAPI.Failure %s"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
@@ -7935,3 +7945,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index 51cc4dc6a..46f746f44 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
-"PO-Revision-Date: 2012-01-02 01:45+0000\n"
-"Last-Translator: jsoler <Unknown>\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
+"PO-Revision-Date: 2012-03-10 06:08+0000\n"
+"Last-Translator: Oscar Rosario <oscar.inirio@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -90,11 +95,11 @@ msgstr ""
 
 #: nova/exception.py:155
 msgid "An unknown exception occurred."
-msgstr ""
+msgstr "Una excepcion desconocida ha ocurrido"
 
 #: nova/exception.py:178
 msgid "Failed to decrypt text"
-msgstr ""
+msgstr "Fallo al desencriptar el texto"
 
 #: nova/exception.py:182
 msgid "Failed to paginate through images from image service"
@@ -102,7 +107,7 @@ msgstr ""
 
 #: nova/exception.py:186
 msgid "Virtual Interface creation failed"
-msgstr ""
+msgstr "Creacion de interfaz virtual fallida"
 
 #: nova/exception.py:190
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
@@ -110,7 +115,7 @@ msgstr ""
 
 #: nova/exception.py:195
 msgid "Connection to glance failed"
-msgstr ""
+msgstr "Coneccion con glance fallida"
 
 #: nova/exception.py:199
 msgid "Connection to melange failed"
@@ -118,11 +123,11 @@ msgstr ""
 
 #: nova/exception.py:203
 msgid "Not authorized."
-msgstr ""
+msgstr "No Autorizado"
 
 #: nova/exception.py:208
 msgid "User does not have admin privileges"
-msgstr ""
+msgstr "El usuario no tiene privilegios de administrador"
 
 #: nova/exception.py:212
 #, python-format
@@ -130,198 +135,210 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "no hay método para el mensaje: %s"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
-msgstr ""
+msgstr "Parametros inaceptables"
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
-msgstr ""
+msgstr "Captura no valida"
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
-msgstr ""
+msgstr "Fallo al ingresar informacion en formato json"
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
-msgstr ""
+msgstr "La petición es inválida."
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
-msgstr ""
+msgstr "Firma invalida %(signature)s para el usuario %(user)s"
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
-msgstr ""
+msgstr "Entrada invalida recibida"
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
-msgstr ""
+msgstr "Rango de puertos invalido %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
-msgstr ""
+msgstr "Protocolo IP invalido %(protocol)s"
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
-msgstr ""
+msgstr "Tipo de contenido invalido %(content_type)s."
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
-msgstr ""
+msgstr "Cidr %(cidr)s invalido"
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
-msgstr ""
+msgstr "Reuso invalido de una coneccion RPC"
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
-msgstr ""
+msgstr "La instacia %(instance_id)s no se esta ejecutando"
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
-msgstr ""
+msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
-msgstr ""
+msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
-msgstr ""
+msgstr "Fallo al suspender la instancia"
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
-msgstr ""
+msgstr "Fallo al resumir el servidor"
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
-msgstr ""
+msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+#, fuzzy
+msgid "Failed to terminate instance"
+msgstr "Fallo a reinicia la instancia"
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
-msgstr ""
+msgstr "El servicio no esta disponible en este momento"
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
-msgstr ""
+msgstr "El servicio de computo no esta disponible en este momento"
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
+"Incapaz de emigrar la instancia %(instance_id)s al actual anfitrion "
+"(%(host)s)"
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
-msgstr ""
+msgstr "El destino del anfitrion de computo no esta disponible en este momento"
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
-msgstr ""
+msgstr "El anfitrion de computo no esta disponible en este momento"
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
-msgstr ""
+msgstr "Informacion del CPU inaceptable"
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
-msgstr ""
+msgstr "%(address)s no es una direccion IP v4/6 valida"
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -329,618 +346,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
-msgstr ""
+msgstr "Formato de disco %(disk_format)s no es aceptable"
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "El usuario %(uid)s es actualmente miembro del grupo %(group_dn)s"
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1066,6 +1074,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, fuzzy, python-format
+msgid "Could not fetch image %(image)s"
+msgstr "No se puede unir la imagen con el loopback: %s"
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1098,193 +1111,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr "Se detuvo un servicio sin entrada en la base de datos"
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr "El servicio objeto de base de datos ha desaparecido, recreándolo."
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr "Recuperada la conexión al servidor de modelos."
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr "el servidor de modelos se ha ido"
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr "Conjunto completo de opciones (FLAGS):"
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Excepción interna: %s"
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr "Obteniendo %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Ejecutando cmd (subprocesos): %s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "El resultado fue %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "corriendo cmd (SSH): %s"
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Depuración de la devolución de llamada: %s"
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "No se encuentra la dirección del enlace local.:%s"
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "No se pudo obtener enlace de la ip local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "backend inválido: %s"
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1324,6 +1341,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1357,97 +1379,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Fallo de autenticación: %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr "acción: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "No encontrado: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, fuzzy, python-format
 msgid "ValidatorError raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Ha sucedido un error desconocido. Por favor repite el intento de nuevo."
 
@@ -1461,170 +1483,232 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr "Creando par de claves %s"
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Borrar para de claves %s"
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
+#, fuzzy, python-format
 msgid "Invalid CIDR"
+msgstr "Cidr %(cidr)s invalido"
+
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr "Revocar ingreso al grupo de seguridad %s"
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr "No hay regla para los parámetros especificados."
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr "Autorizar ingreso al grupo de seguridad %s"
+
+#: nova/api/ec2/cloud.py:723
+#, fuzzy, python-format
+msgid "%s - This rule already exists in group"
+msgstr "Esta regla ya existe en el grupo %s"
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Crear Grupo de Seguridad %s"
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr "el grupo %s ya existe"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Crear volumen de %s GB"
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+#, fuzzy, python-format
+msgid "Detach Volume Failed."
+msgstr "Desasociar volumen %s"
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo no soportado: %s"
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr "Asignar dirección"
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar dirección %s"
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr "usuario o grupo no especificado"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr "sólo el grupo \"all\" está soportado"
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr "operation_type debe ser añadir o eliminar"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Actualizando imagen %s públicamente"
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr "Fallo al generar metadatos para la ip %s"
@@ -1693,36 +1777,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1791,12 +1885,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1852,7 +1946,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1869,20 +1963,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1892,8 +1986,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1970,179 +2064,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2181,7 +2278,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2214,8 +2311,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2233,46 +2330,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2305,8 +2402,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2326,8 +2423,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2369,11 +2466,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2471,11 +2568,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr "Autorizar ingreso al grupo de seguridad %s"
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2493,27 +2585,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr "Revocar ingreso al grupo de seguridad %s"
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2527,82 +2614,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2626,7 +2637,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2645,133 +2656,133 @@ msgstr ""
 "Se ha intentado eliminar el último miembro de un grupo. Eliminando el "
 "grupo %s en su lugar."
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Buscando usuario: %r"
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Fallo de autorización para la clave de acceso %s"
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Utilizando nombre de proyecto = nombre de usuario (%s)"
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Firma invalida para el usuario %s"
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr "Debes especificar un proyecto"
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "Creado el proyecto %(name)s con administrador %(manager_user)s"
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr "Modificando proyecto %s"
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Agregando usuario %(uid)s para el proyecto %(pid)s"
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Borrar usuario %(uid)s del proyecto %(pid)s"
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr "Borrando proyecto %s"
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr "Borrando usuario %s"
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "Cambio de clave de acceso para el usuario %s"
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "Cambio de clave secreta para el usuario %s"
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "No hay datos vpn para el proyecto %s"
@@ -2798,123 +2809,131 @@ msgstr "Mascara de red a insertar en la configuración de openvpn"
 msgid "Launching VPN for %s"
 msgstr "Lanzando VPN para %s"
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+#, fuzzy, python-format
+msgid "Cannot run any more instances of this type."
 msgstr ""
+"Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
+"este tipo."
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, fuzzy, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
+"Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
+"este tipo."
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
-"Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
-"este tipo."
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr "Creando una instancia raw"
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2966,453 +2985,455 @@ msgstr "check_instance_lock: no ejecutando |%s|"
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:398
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
-msgstr ""
-
-#: nova/compute/manager.py:404
-#, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
-msgstr ""
+#: nova/compute/manager.py:406
+#, fuzzy, python-format
+msgid "Exception encountered while terminating the instance %s"
+msgstr "Después de terminar las instancias: %s"
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "La instancia ha sido creada previamente"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "intentando finalizar una instancia que ya había sido finalizada: %s"
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr "instancia %s: rescatando"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr "instancia %s: pausando"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr "instancia %s: continuando tras pausa"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr "instancia %s: obteniendo los diagnosticos"
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr "instancia %s: suspendiendo"
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr "instancia %s: continuando"
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr "instancia %s: bloqueando"
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr "instancia %s: desbloqueando"
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr "instancia %s: pasando a estado bloqueado"
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr "instancia %s: reiniciar redes"
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
-#, python-format
+#: nova/compute/manager.py:1713
+#, fuzzy, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
-msgstr ""
+msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr "Desvinculando volumen de instancia desconocida %s"
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3487,31 +3508,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr "El uso de una petición de contexto vacía está en desuso"
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3524,11 +3545,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3536,6 +3552,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3594,74 +3611,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3684,94 +3705,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Excepción al recargar la configuración de dnsmasq: %s"
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "El pid %d está pasado, relanzando dnsmasq"
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "Matando radvd lanzado %s"
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d corrupto, relanzando radvd"
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Iniciando interfaz VLAN %s"
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, fuzzy, python-format
+msgid "Starting bridge %s "
+msgstr "Iniciando interfaz puente para %s"
+
+#: nova/network/linux_net.py:1145
+#, fuzzy, python-format
+msgid "Done starting bridge %s"
+msgstr "Des-registrando la imagen %s"
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3779,41 +3814,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr "configurando la red del host"
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3821,68 +3856,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3897,7 +3932,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3907,7 +3942,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3917,7 +3952,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3950,42 +3985,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -4008,15 +4043,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4026,7 +4061,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4038,56 +4073,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr "contenido desempaquetado: %s"
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "recibido %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "No hay método para el mensaje: %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID es %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4103,119 +4138,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "Reconectado a la cola"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "respuesta %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "mensaje %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4225,30 +4268,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4273,182 +4292,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr "Debe de implementar un horario de reserva"
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
-#, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
-#, python-format
-msgid "No capability selected for volume of size %(size)s"
-msgstr ""
+#: nova/scheduler/manager.py:159
+#, fuzzy, python-format
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4505,34 +4477,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Después de terminar las instancias: %s"
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4595,27 +4567,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4624,19 +4588,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4671,11 +4632,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4730,77 +4686,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "Fallo al abrir conexión con el hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4824,21 +4740,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4874,7 +4790,7 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -4883,33 +4799,23 @@ msgstr ""
 "Debes especificar xenapi_connection_url, xenapi_connection_username "
 "(opcional), y xenapi_connection_password para usar connection_type=xenapi"
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obtenida excepción %s"
@@ -5092,7 +4998,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr "instancia %s: Creando imagen"
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5114,7 +5020,7 @@ msgstr "instancia %s: comenzando método toXML"
 msgid "instance %s: finished toXML method"
 msgstr "instancia %s: finalizado método toXML"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5129,8 +5035,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5155,44 +5061,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "Fallo al montar el sistema de ficheros: %s"
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5238,171 +5158,169 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr "Conexión a libvirt rota"
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
+#, fuzzy
 msgid "Failed to soft reboot instance."
-msgstr ""
+msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr "virsh dijo: %r"
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr "genial, es un dispositivo"
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
-msgstr ""
+#: nova/virt/libvirt/connection.py:967
+#, fuzzy
+msgid "Guest does not have a console available"
+msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5412,35 +5330,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5459,148 +5382,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5609,29 +5533,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5750,260 +5674,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6038,27 +5962,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr "Lanzando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake no tiene una implementación para %s"
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Llamando %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6074,16 +5998,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6113,27 +6037,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "Imposible desasociar volumen %s"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6150,49 +6074,62 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr "Creada VM %s..."
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr "VM creada %(instance_name)s como %(vm_ref)s."
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
+msgid "VBD not found in instance %s"
+msgstr "VBD no encontrado en la instancia %s"
 
-#: nova/virt/xenapi/vm_utils.py:251
-#, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:265
+#, fuzzy, python-format
+msgid "VBD %s already detached"
+msgstr "el grupo %s ya existe"
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
-msgstr "VBD no encontrado en la instancia %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Imposible desconectar VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, fuzzy, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6201,388 +6138,364 @@ msgstr ""
 "VDI creado %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "sobre %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr "Creando snapshot de la VM %(vm_ref)s con etiqueta '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr "Instantánea creada %(template_vm_ref)s de la VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr "Tamaño para imagen %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando VDI %s a /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destruído"
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Buscando vid %s para el kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s está todavía disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s tiene origen en %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr "Creando VBD para VDI %s ... "
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr "Creando VBF para VDI %s terminado"
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr "VBD.Primera desconexión satisfactoria."
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr "VBD. Desconexión rechazada: reintentándolo..."
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr "VBD.Finalmente logro desconectar."
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Ejecutando pygrub contra %s"
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen Encontrado %s"
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen no encontrado. Reiniciando HVM"
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6614,278 +6527,278 @@ msgstr ""
 #: nova/virt/xenapi/vmops.py:357
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr "Instancia %s: no se pudo iniciar"
+msgstr "La instacia %(instance_id)s no se esta ejecutando"
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr "Iniciando VM %s..."
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr "Finalizado el snapshot y la subida de la VM %s"
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "Creado el VIF %(vif_ref)s para VM %(vm_ref)s, red %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6918,7 +6831,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6935,7 +6848,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6958,164 +6871,150 @@ msgstr "Introduciendo %s..."
 msgid "Unable to find SR from VBD %s"
 msgstr "Imposible encontrar SR en VBD %s"
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr "Creando VBD para VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr "Incapaz de insertar VDI en SR %s"
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr "Imposible obtener copia del VDI %s en"
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr "Inposible insertar VDI para SR %s"
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Punto de montaje no puede ser traducido: %s"
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "No es posible crear el VDI en SR %(sr_ref)s para la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "No es posible usar SR %(sr_ref)s para la instancia %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Imposible adjuntar volumen a la instancia %s"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 "El punto de montaje %(mountpoint)s esta unido a la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Imposible desasociar volumen %s"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7157,7 +7056,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7166,59 +7065,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "El estado del volumen debe estar disponible"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "Recuperandose de una ejecución fallida. Intenta el número %s"
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "el grupo de volumenes %s no existe"
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7252,74 +7152,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7345,83 +7177,83 @@ msgstr "volume %(vol_name)s: creando lv del tamaño %(vol_size)sG"
 msgid "volume %s: creating export"
 msgstr "volumen %s: exportando"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volumen %s: creado satisfactoriamente"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr "El volumen todavía está asociado"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr "Volumen no local a este nodo"
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volumen %s: eliminando exportación"
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volumen %s: eliminando"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volumen %s: eliminado satisfactoriamente"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7488,102 +7320,106 @@ msgstr "Fallo al generar metadatos para la ip %s"
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7662,11 +7498,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7747,144 +7583,97 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
-
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7903,6 +7692,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "intentando finalizar una instancia que ya había sido finalizada: %s"
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7914,12 +7722,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7928,6 +7872,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr "virsh dijo: %r"
+
+#~ msgid "cool, it's a device"
+#~ msgstr "genial, es un dispositivo"
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7937,12 +7890,76 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr "Creando VBD para VDI %s ... "
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr "Creando VBF para VDI %s terminado"
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr "VBD.Primera desconexión satisfactoria."
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr "VBD. Desconexión rechazada: reintentándolo..."
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr "VBD.Finalmente logro desconectar."
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
+#~ msgid "instance %s: Failed to spawn"
+#~ msgstr "Instancia %s: no se pudo iniciar"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
@@ -7955,3 +7972,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "Creando VBD para VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index c90ef9ed1..a09e4b6ad 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
-"PO-Revision-Date: 2011-05-27 16:50+0000\n"
-"Last-Translator: Capashen <Unknown>\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
+"PO-Revision-Date: 2012-03-16 09:03+0000\n"
+"Last-Translator: Gabriel U. <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -128,198 +133,208 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "Pas de méthode pour le message : %s"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
-msgstr ""
+msgstr "La requête est invalide."
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+#, fuzzy
+msgid "Failed to terminate instance"
+msgstr "Début de la destruction d'instance"
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -327,618 +342,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "L'utilisateur %(uid)s est déjà membre du groupe %(group_dn)s"
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1064,6 +1070,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, fuzzy, python-format
+msgid "Could not fetch image %(image)s"
+msgstr "Impossible de lier l'image au loopback : %s"
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1096,193 +1107,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "Démarrage du noeud %(topic)s (version %(vcs_string)s)"
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr "Service détruit sans entrée dans la base de données"
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr "L'objet du service de base de données à disparru, re-création en cours."
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr "Récupération du modelle de connexion serveur terminée!"
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr "Le modèle de serveur à disparu"
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr "Ensemble de propriétés complet :"
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Exception interne : %s"
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr "Récupèration de %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Execution de la commande (sous-processus) : %s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "Le résultat était %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Execution de la cmd (SSH): %s"
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Debug dans le rappel : %s"
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "L'adresse du lien local n'a pas été trouvé :%s"
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Impossible de trouver l'IP du lien local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend invalide : %s"
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1322,6 +1337,11 @@ msgstr "non disponible"
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1358,99 +1378,99 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Echec d'authentification : %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "Requête authentifiée pour : %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 "Requête non authorisé pour le controlleur=%(controller)s et "
 "l'action=%(action)s"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "\"Instance non trouvée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "\"Volume non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "\"Non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, fuzzy, python-format
 msgid "ValidatorError raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Une erreur inopinée à eu lieu. Merci d'essayer votre requête à nouveau."
 
@@ -1466,174 +1486,235 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr "Création du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Suppression du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr "Révocation de groupe de sécurité %s"
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, fuzzy, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr "Pas assez de parametres pour contruire un règle valide."
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr "Pas de règle pour les paramètres spécifiés."
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr "Authorisation du groupe de sécurité %s"
+
+#: nova/api/ec2/cloud.py:723
+#, fuzzy, python-format
+msgid "%s - This rule already exists in group"
+msgstr "Cette règle existe déjà dans le groupe %s"
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Création du groupe de sécurité %s"
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr "le groupe %s existe déjà"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Création d'un volume de %s Go"
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+#, fuzzy, python-format
+msgid "Detach Volume Failed."
+msgstr "Dé-montage du volume %s"
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribut non reconnu : %s"
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr "Allocation d'adresse"
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Association de l'adresse %(public_ip)s avec l'instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr "Début de la destruction d'instance"
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr "Dé-enregitrement de l'image %s"
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Image %(image_location)s enregistré avec l'id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr "Utilisateur ou groupe non spécifié"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr "Seul le group \"tous\" est supporté"
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 "le type d'opération (operation_type) doit être ajout (add) ou suppression"
 " (remove)"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Mis à jour de la publication de l'image %s"
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
@@ -1702,36 +1783,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1800,12 +1891,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1861,7 +1952,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1878,20 +1969,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1901,8 +1992,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1979,179 +2070,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2190,7 +2284,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2223,8 +2317,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2242,46 +2336,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2314,8 +2408,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2335,8 +2429,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2378,11 +2472,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2480,11 +2574,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr "Authorisation du groupe de sécurité %s"
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr "Pas assez de parametres pour contruire un règle valide."
@@ -2502,27 +2591,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr "Révocation de groupe de sécurité %s"
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2536,82 +2620,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2635,7 +2643,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2654,29 +2662,29 @@ msgstr ""
 "Tentative de suppression du dernier membre d'un groupe.  Essayez plutôt "
 "de supprimer le group sur %s."
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Recherche de l'utilisateur : %r"
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Autorisation refusée pour la clef d'accès %s"
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Nom de projet utilisé = nom d'utilisateur (%s)"
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 "Autorisation refusée : pas de projet nommé %(pjid)s "
 "(utilisateur=%(uname)s)"
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
@@ -2685,108 +2693,108 @@ msgstr ""
 "Autorisation refusée : utilisateur %(uname)s n'est ni admin ni membre du "
 "projet %(pjname)s"
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Signature non valide pour l'utilisateur %s"
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr "Le projet doit être spécifié"
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "Ajout du rôle %(role)s à l'utilisateur %(uid)s pour le projet %(pid)s"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr "Ajout du rôle global %(role)s pour l'utilisateur %(uid)s"
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 "Suppression du rôle %(role)s pour l'utilisateur %(uid)s dans le projet "
 "%(pid)s"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr "Suppression du role global %(role)s pour l'utilisateur %(uid)s"
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "Création du projet %(name)s ayant pour manager %(manager_user)s"
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr "modification du projet %s"
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Ajout de l'utilisateur %(uid)s au projet %(pid)s"
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Suppression de l'utilisateur %(uid)s du projet %(pid)s"
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr "Suppression du projet %s"
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "Utilisateur créé %(rvname)s (admin: %(rvadmin)r)"
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "Clef d'accès changée pour l'utilisateur %s"
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "Clef secrète changée pour l'utilisateur %s"
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "Statut admin changé en %(admin)r pour l'utilisateur %(uid)s"
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "Pas de données VPN pour le projet %s"
@@ -2813,123 +2821,131 @@ msgstr "Masque réseau à passer à la configuration d'openvpn"
 msgid "Launching VPN for %s"
 msgstr "Démarrage du VPN pour %s"
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+#, fuzzy, python-format
+msgid "Cannot run any more instances of this type."
 msgstr ""
+"Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
+" type de plus."
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, fuzzy, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
+"Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
+" type de plus."
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
-"Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
-" type de plus."
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr "Création d'une instance raw"
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2981,453 +2997,455 @@ msgstr "check_instance_lock: ne s'éxécute pas |%s|"
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:398
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
-msgstr ""
-
-#: nova/compute/manager.py:404
-#, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
-msgstr ""
+#: nova/compute/manager.py:406
+#, fuzzy, python-format
+msgid "Exception encountered while terminating the instance %s"
+msgstr "Après l'arrêt d'instances : %s"
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "L'instance a déjà été crée"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "Tentative de destruction d'une instance déjà détruite: %s"
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr "instance %s: récupération"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr "instance %s: dé-récupération"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr "instance %s: mise en pause"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr "instance %s: reprise après pause"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr "instance %s: récupération des diagnostiques"
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr "instance %s: suspension"
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr "instance %s: reprise après suspension"
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr "instance %s: vérrouillage"
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr "instance %s: déverrouillage"
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr "instance %s: récupération de l'état de vérouillage"
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr "instance %s: redémarrage du réseau"
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr "Démontage de volume d'une instance inconnue %s"
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3502,31 +3520,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr "L'utilisation d'une requête de contexte vide est dévalué"
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3539,11 +3557,6 @@ msgstr "python-migrate n'est pas installé. Fin d'éxécution."
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3551,6 +3564,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3609,74 +3623,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "Impossible de déchiffrer le vecteur d'initialisation : %s"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "Impossible de déchiffrer le fichier image %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3699,94 +3717,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq à renvoyé %s"
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d est dépassé, re-démarrage de dnsmasq"
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "La destruction de radvd à renvoyé %s"
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d est dépassé, re-démarrage radvd"
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Démarrage de l'interface VLAN %s"
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, fuzzy, python-format
+msgid "Starting bridge %s "
+msgstr "Démarrage de l'interface de Bridge %s"
+
+#: nova/network/linux_net.py:1145
+#, fuzzy, python-format
+msgid "Done starting bridge %s"
+msgstr "Erreur au démarrage xvp : %s"
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3794,41 +3826,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3836,68 +3868,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s libérée qui n'était pas allouée"
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "La somme du nombre de réseau et le début de vlan ne peut excéder 4094"
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3912,7 +3944,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3922,7 +3954,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3932,7 +3964,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3965,42 +3997,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -4023,15 +4055,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4041,7 +4073,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4053,56 +4085,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Renvoi de l'exception %s à l'appelant"
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr "Contexte décompacté : %s"
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "%s reçu"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID est %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4118,119 +4150,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "Reconnection à la queue"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr "Initialisation du Consomateur d'Adapteur pour %s"
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "réponse %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr "le sujet est %s"
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "message %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4240,30 +4280,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4288,182 +4304,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr "Doit mettre en oeuvre un calendrier de retrait"
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4520,34 +4489,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr "Instance actives : %s"
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Après l'arrêt d'instances : %s"
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4610,27 +4579,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4639,19 +4600,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4686,11 +4644,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4745,77 +4698,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Reception par Nested %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested renvoi %s"
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "Échec lors de l'ouverture d'une connexion à l'hyperviseur"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4839,21 +4752,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4889,7 +4802,7 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -4899,33 +4812,23 @@ msgstr ""
 "(optionel), et xenapi_connection_password pour utiliser "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr "Tâche [%(name)s] %(task)s état : succès   %(result)s"
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr "Tâche [%(name)s] %(task)s état : %(status)s    %(error_info)s"
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr "Reçu exception : %s"
@@ -5108,7 +5011,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr "instance %s : Création de l'image"
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5132,7 +5035,7 @@ msgstr "instance %s: démarrage de la méthode toXML"
 msgid "instance %s: finished toXML method"
 msgstr "instance %s: fin d'éxécution de la méthode toXML"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5147,8 +5050,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5173,44 +5076,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "Impossible de monter le système de fichier : %s"
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5256,171 +5173,167 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "Device nbd %s n'est pas apparu"
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr "Connexion à libvirt interrompue"
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr "virsh a retourné : %r"
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr "super, c'est un device"
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5430,35 +5343,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5477,148 +5395,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr "Impossible de trouver un port ouvert"
 
@@ -5627,29 +5546,29 @@ msgstr "Impossible de trouver un port ouvert"
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5768,260 +5687,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6056,27 +5975,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr "Fonction non implémentée"
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake n'a pas d'implémentation pour %s"
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Appel %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6092,16 +6011,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6131,27 +6050,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "Impossible de détacher le volume %s"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6168,49 +6087,62 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr "VM %s crée..."
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr "VM %(instance_name)s crée en tant que %(vm_ref)s."
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
+msgid "VBD not found in instance %s"
+msgstr "VBD non trouvé dans l'instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:251
-#, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:265
+#, fuzzy, python-format
+msgid "VBD %s already detached"
+msgstr "le groupe %s existe déjà"
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
-msgstr "VBD non trouvé dans l'instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Impossible de deconnecter le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, fuzzy, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6219,233 +6151,245 @@ msgstr ""
 "VDI créé %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on"
 " %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 "Création de l'instantané (snapshot) pour la VM %(vm_ref)s avec le label "
 "'%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr "Instantané (snapshot) créé %(template_vm_ref)s pour la  VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr "Taille de l'image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copie de VDI %s vers /boot/guest sur dom0"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Noyau/Ramdisk VDI %s détruit"
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Recherche du VDI %s pour le PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr "Le VDI %s est toujours disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) état xenserver vm -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-parcours de SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s à pour parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -6454,157 +6398,121 @@ msgstr ""
 "L'UUID parent %(parent_uuid)s ne correspond pas au parent originel "
 "%(original_parent_uuid)s, attente de coalesence..."
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr "Création de VBD pour la VDI %s ... "
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr "La création de VBD pour la VDI %s est terminée."
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Connexion de VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Connexion de VBD %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruction de VBD pour la VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destruction de VBD pour la VDI %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr "VBD.unplug terminé dés la première tentative."
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr "VBD.unplug refusé : nouvel essai..."
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr "VBD.unplug à enfin été achevée."
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr "XenAPI.Failure ignorée dans VBD.unplug: %s"
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr "XenAPI.Failure %s ignorée"
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Exécution de pygrub sur %s"
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen %s trouvé"
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Pas de kernel Xen trouvé.  Démarrage en HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Ecriture de la table de partitionnement %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6638,276 +6546,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr "instance %s: n'a pas pu être crée"
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr "Démarrage de la VM %s..."
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr "Fin de l'instantané et du chargement de VM %s"
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr "Fichiers noyau/ramdisk supprimés"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "VIF créé %(vif_ref)s pour la VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erreur OpenSSL : %s"
@@ -6940,7 +6848,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "%(label)s introduit comme %(sr_ref)s."
@@ -6957,7 +6865,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6980,164 +6888,150 @@ msgstr "Introduction de %s"
 msgid "Unable to find SR from VBD %s"
 msgstr "Impossible de trouver SR du VDB %s"
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr "Création de VBD pour VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr "Exception %(exc)s ignorée pendant l'obtention de PBDs pour %(sr_ref)s"
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr "Exception %(exc)s ignorée pendant la deconnexion du PBD %(pbd)s"
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr "Impossible d'introduire VDI sur SR %s"
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr "Impossible de récuppérer l'enregistrement du VDI %s sur"
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr "Impossible d'introduire le VDI pour SR %s"
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Le point de montage ne peut pas être traduit : %s"
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "Impossible de créer VDI sur SR %(sr_ref)s pour l'instance "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Impossible d'utiliser SR %(sr_ref)s pour l'instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 "Le point de montage %(mountpoint)s a été attaché à l'instance "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Impossible de trouver le volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Impossible de détacher le volume %s"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7179,7 +7073,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7188,59 +7082,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "Le status du volume doit être disponible"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "Récupération après une exécution erronée. Tentative numéro %s"
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "Le groupe de volume %s n'existe pas"
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr "Imposible de trouver une exportation iSCSI pour le volume %s"
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7274,74 +7169,6 @@ msgstr "Sheepdog n'est pas actif"
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7367,83 +7194,83 @@ msgstr "volume %(vol_name)s: cŕeation d'un volume logique de %(vol_size)sG"
 msgid "volume %s: creating export"
 msgstr "volume %s: exportation en cours"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: crée avec succès"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr "Le volume est encore attaché"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr "Le volume n'est pas local à ce noeud"
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: suppression de l'exportation"
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: suppression"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: supprimé avec succès"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7510,102 +7337,106 @@ msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7684,11 +7515,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7769,144 +7600,97 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
-
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7922,6 +7706,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "Tentative de destruction d'une instance déjà détruite: %s"
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7933,12 +7736,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr "Tâche [%(name)s] %(task)s état : succès   %(result)s"
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr "Tâche [%(name)s] %(task)s état : %(status)s    %(error_info)s"
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7947,6 +7886,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr "virsh a retourné : %r"
+
+#~ msgid "cool, it's a device"
+#~ msgstr "super, c'est un device"
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7956,12 +7904,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr "Création de VBD pour la VDI %s ... "
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr "La création de VBD pour la VDI %s est terminée."
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr "VBD.unplug terminé dés la première tentative."
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr "VBD.unplug refusé : nouvel essai..."
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr "VBD.unplug à enfin été achevée."
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr "XenAPI.Failure ignorée dans VBD.unplug: %s"
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr "XenAPI.Failure %s ignorée"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
@@ -7974,3 +7983,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "Création de VBD pour VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 1d49a5eaa..a95707c94 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-10-27 15:00+0000\n"
 "Last-Translator: DM74S <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -126,198 +131,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "nessun metodo per il messaggio: %s"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -325,618 +339,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1062,6 +1067,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1094,193 +1104,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr "Servizio terminato che non ha entry nel database"
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr "Il servizio é scomparso dal database, ricreo."
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr "Connessione al model server ripristinata!"
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr "model server é scomparso"
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr "Insieme di FLAGS:"
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Eccezione interna: %s"
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr "Prelievo %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Esecuzione del comando (sottoprocesso): %s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "Il risultato é %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Eseguendo cmd (SSH): %s"
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1320,6 +1334,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1353,97 +1372,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1457,170 +1476,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1689,36 +1768,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1787,12 +1876,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1848,7 +1937,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1865,20 +1954,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1888,8 +1977,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1966,179 +2055,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2177,7 +2269,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2210,8 +2302,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2229,46 +2321,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2301,8 +2393,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2322,8 +2414,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2365,11 +2457,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2466,11 +2558,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2488,27 +2575,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2522,82 +2604,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2621,7 +2627,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2638,133 +2644,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2790,117 +2796,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2952,453 +2963,455 @@ msgstr "check_instance_lock: non esecuzione |%s|"
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "L'istanza é stata già creata"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "Provando a distruggere una istanza già distrutta: %s"
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr "istanza %s: in pausa"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr "istanza %s: fuori pausa"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr "istanza %s: ricezione diagnostiche"
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr "istanza %s: ripristino"
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr "istanza %s: bloccato"
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr "istanza %s: sbloccato"
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3473,31 +3486,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3510,11 +3523,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3522,6 +3530,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3580,74 +3589,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3670,94 +3683,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Avviando l'interfaccia VLAN %s"
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, fuzzy, python-format
+msgid "Starting bridge %s "
+msgstr "Avviando l'interfaccia Bridge per %s"
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3765,41 +3792,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3807,68 +3834,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3883,7 +3910,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3893,7 +3920,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3903,7 +3930,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3936,42 +3963,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3994,15 +4021,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4012,7 +4039,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4024,56 +4051,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Sollevando eccezione %s al chiamante"
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr "contesto decompresso: %s"
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "ricevuto %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "nessun metodo per il messagggio: %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID é %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4089,119 +4116,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "Riconnesso alla coda"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr "Inizializzando il Consumer Adapter per %s"
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "risposta %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr "argomento é %s"
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "messaggio %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4211,30 +4246,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4259,182 +4270,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4491,34 +4455,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4581,27 +4545,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4610,19 +4566,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4657,11 +4610,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4716,77 +4664,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "Fallita l'apertura della connessione verso l'hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4810,21 +4718,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4860,40 +4768,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5076,7 +4974,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5098,7 +4996,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5113,8 +5011,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5139,44 +5037,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5222,171 +5134,167 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: creato con successo"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5396,35 +5304,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5443,148 +5356,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5593,29 +5507,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5734,260 +5648,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6022,27 +5936,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr "Sollevando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Chiamando %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6056,16 +5970,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6095,27 +6009,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6132,437 +6046,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr "Creata VM %s.."
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr "Creata VM %(instance_name)s come %(vm_ref)s"
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s distrutti"
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Cercando vdi %s per kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6596,276 +6499,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr "Istanza %s: esecuzione fallita..."
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6898,7 +6801,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6915,7 +6818,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6938,160 +6841,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Impossible creare il VDI su SR %(sr_ref)s per l'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Impossibile usare SR %(sr_ref)s per l'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s smontato dall'istanza %(instance_name)s"
@@ -7131,7 +7020,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7140,59 +7029,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "Lo stato del volume deve essere disponibile"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7226,74 +7116,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7319,83 +7141,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr "volume %s: creazione in corso per l'esportazione"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: creato con successo"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr "Volume ancora collegato"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: rimuovendo"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: rimosso con successo"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7462,102 +7284,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7636,11 +7462,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7721,144 +7547,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7877,6 +7662,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "Provando a distruggere una istanza già distrutta: %s"
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7888,12 +7692,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7902,6 +7842,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7911,12 +7860,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
@@ -7929,3 +7939,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index 6bb7ebfbb..0f67cd5a0 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-08-23 11:22+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -126,198 +131,208 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "メッセージ %s に対するメソッドが存在しません。"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+#, fuzzy
+msgid "Failed to terminate instance"
+msgstr "インスタンス終了処理を開始します。"
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -325,618 +340,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "ユーザ %(uid)s はすでにグループ %(group_dn)s のメンバです。"
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1062,6 +1068,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, fuzzy, python-format
+msgid "Could not fetch image %(image)s"
+msgstr "イメージをループバック %s にアタッチできません。"
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1094,193 +1105,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "%(topic)s ノードを開始しています (バージョン %(vcs_string)s)"
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr "データベースにエントリの存在しないサービスを終了します。"
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr "サービスデータベースオブジェクトが消滅しました。再作成します。"
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr "モデルサーバへの接続を復旧しました。"
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr "モデルサーバが消滅しました。"
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr "FLAGSの一覧:"
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "内側で発生した例外： %s"
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr "ファイルをフェッチ： %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "コマンド実行(subprocess): %s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "コマンド実行結果： %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "コマンド（SSH)を実行: %s"
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr "コールバック中のデバッグ: %s"
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "リンクローカルアドレスが見つかりません: %s"
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "%(interface)s のローカルIPアドレスのリンクが取得できません:%(ex)s"
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "不正なバックエンドです: %s"
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr "バックエンドは %s です。"
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1320,6 +1335,11 @@ msgstr "利用できません"
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1353,97 +1373,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "%s の認証に失敗しました。"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "%(uname)s 用の認証リクエスト:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr "アクション(action): %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "引数: %(key)s\t\t値: %(value)s"
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "コントローラ=%(controller)s とアクション=%(action)s 用の許可されていないリクエスト"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound が発行されました: %s"
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound が発行されました: %s"
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound 発生: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, fuzzy, python-format
 msgid "ValidatorError raised: %s"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "未知のエラーが発生しました。再度リクエストを実行してください。"
 
@@ -1457,170 +1477,231 @@ msgstr "未サポートの API リクエスト: コントローラ = %(controlle
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair: キーペア %s を作成します。"
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair: キーペア %s を削除します。"
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, fuzzy, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr "有効なルールを作成する為の十分なパラメータがありません"
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr "指定されたパラメータに該当するルールがありません。"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
+
+#: nova/api/ec2/cloud.py:723
+#, fuzzy, python-format
+msgid "%s - This rule already exists in group"
+msgstr "指定されたルールは既にグループ %s に存在しています。"
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group: セキュリティグループ %s を作成します。"
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume: %s GBのボリュームを作成します。"
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s のデバイス %(device)s に接続"
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+#, fuzzy, python-format
+msgid "Detach Volume Failed."
+msgstr "Detach volume: ボリューム %s をデタッチします"
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "アトリビュート %s はサポートされていません。"
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr "Allocate address: アドレスを割り当てます。"
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Release address: アドレス %s を開放します。"
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image: イメージ %s を登録解除します。"
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "イメージ %(image_location)s が ID %(image_id)s で登録されました"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr "ユーザまたはグループが指定されていません。"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr "グループ  \"all\" のみサポートされています。"
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr "operation_type は add または remove の何れかである必要があります。"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "イメージ %s の公開設定を更新します。"
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
@@ -1689,36 +1770,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1787,12 +1878,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1848,7 +1939,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1865,20 +1956,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1888,8 +1979,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1966,179 +2057,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2177,7 +2271,7 @@ msgstr "例外: Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2210,8 +2304,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2229,46 +2323,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2301,8 +2395,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2322,8 +2416,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2365,11 +2459,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2467,11 +2561,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr "有効なルールを作成する為の十分なパラメータがありません"
@@ -2489,27 +2578,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2523,82 +2607,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2622,7 +2630,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2639,133 +2647,133 @@ msgid ""
 "instead."
 msgstr "グループの最後のメンバーを削除しようとしました。代わりにグループ %s を削除してください。"
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr "ユーザ %r を検索します。"
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Failed authorization: アクセスキー %s の認証に失敗しました。"
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "ユーザ名 (%s) をプロジェクト名として使用します。"
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr "許可されません: %(pjid)s という名称のプロジェクトはありません (ユーザ=%(uname)s)"
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr "許可されません: ユーザ %(uname)s は管理者でもプロジェクト %(pjname)s のメンバでもありません。"
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Invalid signature: ユーザ %s の署名が不正です。"
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr "プロジェクトを指定してください。"
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "プロジェクト %(pid)s のユーザ %(uid)s にロール %(role)s を付与します。"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr "サイト共通のロール %(role)s をユーザ %(uid)s に付与します。"
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr "プロジェクト %(pid)s のユーザ  %(uid)s  からロール %(role)s を削除します。"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr "ユーザ %(uid)s からサイト共通のロール %(role)s を削除します。"
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "プロジェクト %(name)s を管理者 %(manager_user)s で作成しました。"
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr "modifying project: プロジェクト %s を更新します。"
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "ユーザ %(uid)s をプロジェクト %(pid)s に追加します。"
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "ユーザ %(uid)s をプロジェクト %(pid)s から削除します。"
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr "Deleting project: プロジェクト %s を削除します。"
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "ユーザ %(rvname)s を作成しました。(管理者: %(rvadmin)r)"
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "Access Key change: ユーザ %s のアクセスキーを更新します。"
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "Secret Key change: ユーザ %s のシークレットキーを更新します。"
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "ユーザ %(uid)s に対して管理者状態が %(admin)r に設定されました。"
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "プロジェクト %s に関するvpnデータがありません。"
@@ -2792,121 +2800,127 @@ msgstr "openvpnの設定に入れるネットマスクの値"
 msgid "Launching VPN for %s"
 msgstr "%s 用のVPNを起動します。"
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
-msgstr ""
+#: nova/compute/api.py:257
+#, fuzzy, python-format
+msgid "Cannot run any more instances of this type."
+msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
-msgstr ""
+#: nova/compute/api.py:259
+#, fuzzy, python-format
+msgid "Can only run %s more instances of this type."
+msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
-msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
+msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr "raw instanceを生成します。"
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2958,453 +2972,455 @@ msgstr "check_instance_lock: not executing |%s|"
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
-#, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
-msgstr ""
+#: nova/compute/manager.py:406
+#, fuzzy, python-format
+msgid "Exception encountered while terminating the instance %s"
+msgstr "インスタンス %s を終了した後です。"
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "インスタンスは既に生成されています。"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "既に消去済みのインスタンス%sを消去しようとしました。"
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr "Rescuing: インスタンス %s をレスキューします。"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr "Unrescuing: インスタンス %s をアンレスキューします。"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr "pausing: インスタンス %s を一時停止します。"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr "unpausing: インスタンス %s の一時停止を解除します。"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr "retrieving diagnostics: インスタンス %s の診断情報を取得します。"
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr "suspending: インスタンス %s をサスペンドします。"
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr "resuming: インスタンス %s をレジュームします。"
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr "locking: インスタンス %s をロックします。"
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr "unlocking: インスタンス %s のロックを解除します。"
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr "getting locked state: インスタンス %s のロックを取得しました。"
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr "インスタンス %s: ネットワークをリセットします"
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr "ボリュームを未知のインスタンス %s からデタッチします。"
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3479,31 +3495,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr "Request context を空とすることは非推奨です。"
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3516,11 +3532,6 @@ msgstr "python-migrate がインストールされていません。終了しま
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3528,6 +3539,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3586,74 +3598,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "プライベートキーの復号に失敗しました: %s"
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "初期化ベクタの復号に失敗しました: %s"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "イメージファイル %(image_file)s の復号に失敗しました: %(err)s"
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3676,94 +3692,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "dnsmasqに対してhupを送信しましたが %s が発生しました。"
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d は無効です。dnsmasqを再実行します。"
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "radvd  停止が %s 例外を発行しました"
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d がストールしているので radvd を再実行しています…"
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "VLANインタフェース %s を開始します。"
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "%s 用のブリッジインタフェースを開始します。"
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, fuzzy, python-format
+msgid "Starting bridge %s "
+msgstr "%s 用のブリッジインタフェースを開始します。"
+
+#: nova/network/linux_net.py:1145
+#, fuzzy, python-format
+msgid "Done starting bridge %s"
+msgstr "xvp の開始中にエラー: %s"
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3771,41 +3801,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3813,68 +3843,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "リースしていないIP %s が開放されました。"
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "ネットワークの数とVLANの開始番号の和は 4094 より大きくできません。"
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3889,7 +3919,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3899,7 +3929,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3909,7 +3939,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3942,42 +3972,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -4000,15 +4030,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4018,7 +4048,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4030,56 +4060,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "呼び出し元に 例外 %s を返却します。"
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr "context  %s をアンパックしました。"
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "受信： %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "メッセージ %s に対するメソッドが存在しません。"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "メッセージ %s に対するメソッドが存在しません。"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_IDは %s です。"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4095,119 +4125,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "キューに再接続しました。"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr "%sのアダプターコンシューマー(Adapter Consumer)を初期化しています。"
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "応答 %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr "topic は %s です。"
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "メッセージ %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4217,30 +4255,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4265,182 +4279,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr "予備の(fallback)スケジューラを実装する必要があります。"
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4497,34 +4464,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr "インスタンス %s は実行中です。"
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "インスタンス %s を終了した後です。"
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4587,27 +4554,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4616,19 +4575,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4663,11 +4619,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4722,77 +4673,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr "ネストした戻り値: %s"
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr "%s を受信。"
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "ハイパーバイザへの接続に失敗しました。"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4816,21 +4727,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4866,7 +4777,7 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -4875,33 +4786,23 @@ msgstr ""
 "connection_type=xenapi を使用するには、以下の指定が必要です： xenapi_connection_url, "
 "xenapi_connection_username (オプション), xenapi_connection_password"
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr "タスク [%(name)s] %(task)s 状態: 成功    %(result)s"
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr "タスク [%(name)s] %(task)s 状態: %(status)s    %(error_info)s"
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr "例外 %s が発生しました。"
@@ -5084,7 +4985,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr "インスタンス %s のイメージを生成します。"
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5106,7 +5007,7 @@ msgstr "インスタンス %s: toXML メソッドを開始。"
 msgid "instance %s: finished toXML method"
 msgstr "インスタンス %s: toXML メソッドを完了。"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5121,8 +5022,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5147,44 +5048,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "ファイルシステム %s のマウントに失敗しました。"
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5230,171 +5145,167 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "nbd デバイス %s が出現しません"
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "libvirt %s へ接続します。"
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr "libvirtへの接続が切れています。"
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr "virsh の出力: %r"
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr "デバイスです。"
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "データ: %(data)r, ファイルパス: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5404,35 +5315,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5451,148 +5367,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr "開いたポートが見つかりません"
 
@@ -5601,29 +5518,29 @@ msgstr "開いたポートが見つかりません"
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5742,260 +5659,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6030,27 +5947,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr "NotImplemented 例外を発生させます。"
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake には %s が実装されていません。"
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "%(localname)s %(impl)s を呼び出します。"
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6064,16 +5981,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6103,27 +6020,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "ボリューム %s を切断(detach)できません"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6140,49 +6057,62 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr "VM %s を作成します。"
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr "%(vm_ref)s として VM %(instance_name)s を作成しています"
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
+msgid "VBD not found in instance %s"
+msgstr "インスタンス %s のVBDが見つかりません。"
 
-#: nova/virt/xenapi/vm_utils.py:251
-#, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:265
+#, fuzzy, python-format
+msgid "VBD %s already detached"
+msgstr "グループ %s は既に存在しています。"
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
-msgstr "インスタンス %s のVBDが見つかりません。"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "VBD %s の unplug に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, fuzzy, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6191,390 +6121,366 @@ msgstr ""
 "%(sr_ref)s 上に VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
 "%(read_only)s) を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr "ラベル '%(label)s' 付き VM %(vm_ref)s のスナップショットを作成しています…"
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr "VM %(vm_ref)s からスナップショット %(template_vm_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "ID %(image_id)s として %(vdi_uuids)s のアップロードの為に xapi を問い合わせしています"
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr "イメージ %(image)s のサイズ:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "ドメイン0 上の /boot/guest に VDI %s をコピー中"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "カーネル/RAMディスク VDI %s が削除されました"
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "PV kernelのvdi %s を取得します。"
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s は依然として存在しています。"
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver の vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi の power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "SR %s を再スキャンします。"
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s の親は %(parent_ref)s です"
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "親 %(parent_uuid)s が元々の親 %(original_parent_uuid)s と一致しません。作成を待機しています…"
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr "VDI %s 用に VBD を作成しています… "
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr "VDI %s 用 VBD の作成が完了しました。"
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "VBD %s を接続しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "仮想ブロックデバイス(VBD) %s の接続が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)を削除しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)の削除が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr "VBD.unplug は１回目で成功しました。"
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr "VBD.unplug が拒否されました: 再試行しています…"
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr "VBD.unplug は最終的に成功しました。"
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr "VBD.unplug 中の XenAPI.Failure を無視しています: %s"
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr "XenAPI.Failure %s を無視しています"
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "%s に対して pygrub を実行しています"
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Xen Kernel %s が見つかりました。"
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 "No Xen kernel found.  Booting HVM.\r\n"
 "Xen 用カーネルが見つかりません。完全仮想化モード(HVM)で起動しています。"
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "パーティションテーブル %s の書き込みが完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6608,276 +6514,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr "インスタンス %s: 起動に失敗しました"
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr "VM %s を開始します…"
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr "VM %s のスナップショットとアップロードが完了しました。"
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr "VM %s に対するスナップショットを開始します。"
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr "カーネル/RAMディスクファイルが削除されました"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "VM %(vm_ref)s, network %(network_ref)s 用 VIF %(vif_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL エラー: %s"
@@ -6910,7 +6816,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "%(sr_ref)s として %(label)s を導入しました"
@@ -6927,7 +6833,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6950,160 +6856,146 @@ msgstr "%s を introduce します…"
 msgid "Unable to find SR from VBD %s"
 msgstr "VBD %s から SRを取得できません。"
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用 VBD を作成しています… "
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr "%(sr_ref)s 用の物理ブロックデバイス(PBD)取得時に例外 %(exc)s を無視しています"
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr "物理ブロックデバイス(PBD) %(pbd)s の取り外し時に例外 %(exc)s を無視しています"
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr "SR %s のVDIのintroduceができません。"
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr "VDI %s のレコードを取得できません。"
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr "SR %s のVDIをintroduceできません。"
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "マウントポイントを変換できません。 %s"
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s 用のSR %(sr_ref)s における VDI を作成できません"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s 用のSR %(sr_ref)s が使用できません"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "インスタンス %s にボリュームを接続(attach)できません。"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s にマウントポイント %(mountpoint)s を接続(attach)しました"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "ボリューム %s を切断(detach)できません"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s からマウントポイント %(mountpoint)s を切断(detach)しました"
@@ -7143,7 +7035,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7152,59 +7044,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "ボリュームのステータス(status)は available でなければなりません。"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "実行失敗からリカバリーします。%s 回目のトライ。"
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "ボリュームグループ%sが存在しません。"
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr "ボリューム %s 用の iSCSI エクスポートが見つかりません"
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7238,74 +7131,6 @@ msgstr "Sheepdog が機能していません"
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7331,83 +7156,83 @@ msgstr "ボリューム %(vol_name)s: サイズ %(vol_size)sG のlvを作成し�
 msgid "volume %s: creating export"
 msgstr "ボリューム %s をエクスポートします。"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "ボリューム %s の作成に成功しました。"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr "ボリュームはアタッチされたままです。"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr "ボリュームはこのノードのローカルではありません。"
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr "ボリューム %s のエクスポートを解除します。"
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr "ボリューム %s を削除します。"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "ボリューム %s の削除に成功しました。"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7474,102 +7299,106 @@ msgstr "ip %s に対するメタデータの取得に失敗しました。"
 msgid "Failed to get target IQN for filer: %s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7648,11 +7477,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7733,144 +7562,97 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
-
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7886,6 +7668,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "既に消去済みのインスタンス%sを消去しようとしました。"
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7897,12 +7698,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr "タスク [%(name)s] %(task)s 状態: 成功    %(result)s"
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr "タスク [%(name)s] %(task)s 状態: %(status)s    %(error_info)s"
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7911,6 +7848,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr "virsh の出力: %r"
+
+#~ msgid "cool, it's a device"
+#~ msgstr "デバイスです。"
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7920,12 +7866,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr "VDI %s 用に VBD を作成しています… "
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr "VDI %s 用 VBD の作成が完了しました。"
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr "VBD.unplug は１回目で成功しました。"
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr "VBD.unplug が拒否されました: 再試行しています…"
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr "VBD.unplug は最終的に成功しました。"
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr "VBD.unplug 中の XenAPI.Failure を無視しています: %s"
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr "XenAPI.Failure %s を無視しています"
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
@@ -7938,3 +7945,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用 VBD を作成しています… "
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 1f73b5fd7..2f78d2603 100644
--- a/nova/locale/ko/LC_MESSAGES/nova.po
+++ b/nova/locale/ko/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-12-16 04:42+0000\n"
 "Last-Translator: Zhongyue Luo <lzyeval@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -126,198 +131,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -325,618 +339,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1062,6 +1067,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1094,193 +1104,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1320,6 +1334,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1353,97 +1372,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1457,170 +1476,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1689,36 +1768,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1787,12 +1876,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1848,7 +1937,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1865,20 +1954,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1888,8 +1977,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1966,179 +2055,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2177,7 +2269,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2210,8 +2302,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2229,46 +2321,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2301,8 +2393,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2322,8 +2414,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2365,11 +2457,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2466,11 +2558,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2488,27 +2575,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2522,82 +2604,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2621,7 +2627,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2638,133 +2644,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2790,117 +2796,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2952,453 +2963,455 @@ msgstr "check_instance_lock: not executing |%s|"
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "인스턴스가 이미 생성되었습니다"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "인스턴스 %s가 이미 삭제되었습니다"
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3473,31 +3486,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3510,11 +3523,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3522,6 +3530,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3580,74 +3589,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3670,94 +3683,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3765,41 +3792,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3807,68 +3834,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3883,7 +3910,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3893,7 +3920,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3903,7 +3930,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3936,42 +3963,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3994,15 +4021,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4012,7 +4039,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4024,56 +4051,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4089,119 +4116,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4211,30 +4246,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4259,182 +4270,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
-#, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4491,34 +4455,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4581,27 +4545,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4610,19 +4566,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4657,11 +4610,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4716,77 +4664,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4810,21 +4718,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4860,40 +4768,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5076,7 +4974,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5098,7 +4996,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5113,8 +5011,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5139,44 +5037,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5222,170 +5134,166 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5395,35 +5303,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5442,148 +5355,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5592,29 +5506,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5733,260 +5647,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6021,27 +5935,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6055,16 +5969,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6094,27 +6008,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6131,437 +6045,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6595,276 +6498,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr "인스턴스 %s: 생성에 실패했습니다"
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6897,7 +6800,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6914,7 +6817,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6937,160 +6840,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스의 %(sr_ref)s SR에 대한 VDI 생성이 실패했습니다"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스의 %(sr_ref)s SR을 사용 할 수 없습니다"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 장착되었습니다"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 탈착되었습니다"
@@ -7130,7 +7019,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7139,59 +7028,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "볼륨의 상태를 알 수 없습니다"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7225,74 +7115,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7318,83 +7140,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7460,102 +7282,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7634,11 +7460,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7719,144 +7545,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7875,6 +7660,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "인스턴스 %s가 이미 삭제되었습니다"
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7886,12 +7690,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7900,6 +7840,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7909,12 +7858,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
@@ -7927,3 +7937,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 4311daf43..0d2546864 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: nova 2012.1\n"
+"Project-Id-Version: nova 2012.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+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,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -121,198 +126,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -320,618 +334,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1057,6 +1062,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1089,193 +1099,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1315,6 +1329,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1348,97 +1367,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1452,170 +1471,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1684,36 +1763,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1782,12 +1871,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1843,7 +1932,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1860,20 +1949,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1883,8 +1972,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1961,179 +2050,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2172,7 +2264,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2205,8 +2297,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2224,46 +2316,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2296,8 +2388,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2317,8 +2409,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2360,11 +2452,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2461,11 +2553,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2483,27 +2570,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2517,82 +2599,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2616,7 +2622,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2633,133 +2639,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2785,117 +2791,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2947,453 +2958,455 @@ msgstr ""
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:406
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
-msgstr ""
-
-#: nova/compute/manager.py:404
-#, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
+#: nova/compute/manager.py:699
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:708
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
 #, python-format
-msgid "terminating bdm %s"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3468,31 +3481,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3505,11 +3518,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3517,6 +3525,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3575,74 +3584,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3665,94 +3678,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3760,41 +3787,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3802,68 +3829,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3878,7 +3905,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3888,7 +3915,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3898,7 +3925,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3931,42 +3958,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3989,15 +4016,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4007,7 +4034,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4019,56 +4046,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4084,119 +4111,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4206,30 +4241,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4254,182 +4265,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
-#, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
-msgstr ""
-
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4486,34 +4450,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4576,27 +4540,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4605,19 +4561,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4652,11 +4605,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4711,77 +4659,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4805,21 +4713,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4855,40 +4763,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5071,7 +4969,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5093,7 +4991,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5108,8 +5006,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5134,44 +5032,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5217,170 +5129,166 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5390,35 +5298,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5437,148 +5350,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5587,29 +5501,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5728,260 +5642,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6016,27 +5930,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6050,16 +5964,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6089,27 +6003,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6126,437 +6040,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6590,276 +6493,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6892,7 +6795,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6909,7 +6812,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6932,160 +6835,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7125,7 +7014,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7134,59 +7023,59 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+msgid "Volume status must be available or error"
 msgstr ""
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7220,74 +7109,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7313,83 +7134,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7455,102 +7276,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7629,11 +7454,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7714,131 +7539,3 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
-
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
-
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
-
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
-
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
-
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
-
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
-
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
-
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
-
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
-
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
-
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
-
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
-
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
-
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
-
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
-
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
-
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
-
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
-
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
-
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
-
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
-
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
-
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
-
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
-
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index ff7ad30d0..fb20b62e8 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2012-02-06 21:07+0000\n"
 "Last-Translator: Adriano Steffler <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -126,198 +131,208 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "sem método para mensagem: %s"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+#, fuzzy
+msgid "Failed to terminate instance"
+msgstr "Começando a terminar instâncias"
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -325,618 +340,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "Usuário %(uid)s já é um membro do grupo %(group_dn)s"
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1062,6 +1068,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1094,193 +1105,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr "Encerrado serviço que não tem entrada na base de dados"
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr "O objeto da base de dados do serviço desapareceu, Recriando."
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr "Recuperada conexão servidor de modelo."
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr "servidor de modelo perdido"
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr "Conjunto completo de FLAGS:"
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Exceção interna: %s"
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr "Buscando %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Executando comando (subprocesso): %s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "Resultado foi %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Executando o comando (SSH): %s"
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr "depuração em retorno de chamada: %s"
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Endereço para Link Local não encontrado: %s"
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Não foi possível atribuir um IP para o Link Local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend inválido: %s"
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1320,6 +1335,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1353,97 +1373,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Falha de Autenticação: %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr "ação: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound lançado: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, fuzzy, python-format
 msgid "ValidatorError raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Ocorreu um erro desconhecido. Por favor tente sua requisição novamente."
 
@@ -1457,170 +1477,231 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr "Criar par de chaves %s"
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Remover par de chaves %s"
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr "Revogado entrada do grupo de segurança %s"
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr "Não existe regra para os parâmetros especificados"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr "Autorizada entrada do grupo de segurança %s"
+
+#: nova/api/ec2/cloud.py:723
+#, fuzzy, python-format
+msgid "%s - This rule already exists in group"
+msgstr "Esta regra já existe no grupo %s"
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Criar Grupo de Segurança %s"
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr "group %s já existe"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Criar volume de %s GB"
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+#, fuzzy, python-format
+msgid "Detach Volume Failed."
+msgstr "Desanexar volume %s"
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo não suportado: %s"
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr "Alocar endereço"
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar endereço %s"
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr "Começando a terminar instâncias"
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instância %r"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr "usuário ou grupo não especificado"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr "apenas o grupo \"all\" é suportado"
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr "operation_type deve ser add ou remove"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Atualizando publicidade da imagem %s"
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr "Falha ao obter metadados para o ip: %s"
@@ -1689,36 +1770,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1787,12 +1878,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1848,7 +1939,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1865,20 +1956,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1888,8 +1979,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1966,179 +2057,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2177,7 +2271,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2210,8 +2304,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2229,46 +2323,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2301,8 +2395,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2322,8 +2416,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2365,11 +2459,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2467,11 +2561,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr "Autorizada entrada do grupo de segurança %s"
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2489,27 +2578,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr "Revogado entrada do grupo de segurança %s"
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2523,82 +2607,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2622,7 +2630,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2641,133 +2649,133 @@ msgstr ""
 "Tentatica de remover o último membto de um grupo. Ao invés disso "
 "excluindo o grupo %s."
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Procurando usuário: %r"
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Falha de autorização para chave de acesso %s"
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Usando nome do projeto = nome do usuário (%s)"
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Assinatura inválida para usuário %s"
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr "Deve especificar projeto"
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr "modificando projeto %s"
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Adicionando usuário %(uid)s ao projeto %(pid)s"
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Remover usuário %(uid)s do projeto %(pid)s"
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr "Excluindo projeto %s"
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr "Apagando usuário %s"
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2794,120 +2802,125 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr "Executando VPN para %s"
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2959,453 +2972,455 @@ msgstr "check_instance_lock: not executando |%s|"
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "A instância já foi criada"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "tentando destruir instância já destruida: %s"
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr "Reiniciando a instância %s"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr "instância %s: resgatando"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr "instância %s: desfazendo o resgate"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr "instância %s: pausando"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr "instância %s: saindo do pause"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr "instância %s: recuperando os diagnósticos"
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr "instância %s: suspendendo"
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr "instância %s: resumindo"
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr "instância %s: bloqueando"
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr "instância %s: desbloqueando"
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr "instância %s: obtendo estado de bloqueio"
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr "instância %s: reset da rede"
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr "Desconectando volume da instância desconhecida %s"
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3480,31 +3495,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3517,11 +3532,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3529,6 +3539,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3587,74 +3598,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3677,94 +3692,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d está ultrapassado, reiniciando dnsmasq"
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d está ultrapassado, reiniciando radvd"
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Iniciando a VLAN %s"
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Iniciando a Bridge para %s"
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, fuzzy, python-format
+msgid "Starting bridge %s "
+msgstr "Iniciando a Bridge para %s"
+
+#: nova/network/linux_net.py:1145
+#, fuzzy, python-format
+msgid "Done starting bridge %s"
+msgstr "Removendo o registro da imagem %s"
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3772,41 +3801,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3814,68 +3843,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3890,7 +3919,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3900,7 +3929,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3910,7 +3939,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3943,42 +3972,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -4001,15 +4030,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4019,7 +4048,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4031,56 +4060,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Retornando exceção %s ao método de origem"
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr "conteúdo descompactado: %s"
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "recebido %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "sem método para mensagem: %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "Sem método para mensagem: %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID é %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4096,119 +4125,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "Reconectado à fila"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr "Iniciando o Adaptador Consumidor para %s"
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "resposta %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr "topico é %s"
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "mensagem %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4218,30 +4255,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4266,182 +4279,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
-#, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4498,34 +4464,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4588,27 +4554,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4617,19 +4575,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4664,11 +4619,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4723,77 +4673,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "Falha ao abrir a conexão com o hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4817,21 +4727,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4867,40 +4777,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5083,7 +4983,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5105,7 +5005,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5120,8 +5020,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5146,44 +5046,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5229,171 +5143,167 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: criado com sucesso"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5403,35 +5313,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5450,148 +5365,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr "Impossível localizar uma porta aberta"
 
@@ -5600,29 +5516,29 @@ msgstr "Impossível localizar uma porta aberta"
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5741,260 +5657,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6029,27 +5945,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr "Aumento não implementado"
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake não tem uma implementação para %s"
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Chamando %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6065,16 +5981,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6104,27 +6020,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "Não é possível desconectar o volume %s"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6141,49 +6057,62 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr "VM %s criada..."
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr "VM %(instance_name)s criada como %(vm_ref)s."
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
+msgid "VBD not found in instance %s"
+msgstr "O VBD não foi encontrado na instância %s"
 
-#: nova/virt/xenapi/vm_utils.py:251
-#, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:265
+#, fuzzy, python-format
+msgid "VBD %s already detached"
+msgstr "group %s já existe"
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
-msgstr "O VBD não foi encontrado na instância %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Não é possível desconectar o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, fuzzy, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6192,390 +6121,366 @@ msgstr ""
 "VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) no SR "
 "%(sr_ref)s criada com sucesso."
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr "Fazendo um snapshot da VM %(vm_ref)s com rótulo '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr "Snapshot %(template_vm_ref)s criado a partir da VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 "Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
 "%(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr "Tamanho da imagem %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando o VDI %s de /boot/guest no dom0"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk %s destruidos"
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Verificando o vdi %s para kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr "O VDI %s continua disponível"
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver vm state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "O VHD %(vdi_uuid)s tem pai %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr "Criando VBD para VDI %s ... "
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr "O VBD para VDI %s foi criado."
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Conectando VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "O VDB %s foi conectado."
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruindo VBD para o VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "O VBD para o VDI %s foi destruído."
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr "Ignorando XenAPI.Failure em VBD.unplug: %s"
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Rodando pygrub novamente %s"
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen encontrado: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen não encontrado. Iniciando como HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6609,276 +6514,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr "instância %s: falha na geração"
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "VIF %(vif_ref)s criada para VM %(vm_ref)s, rede %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erro de OpenSSL: %s"
@@ -6911,7 +6816,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6928,7 +6833,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6951,162 +6856,148 @@ msgstr "Introduzindo %s..."
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr "Criando VBD para VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Ponto de montagem não pode ser traduzido: %s"
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "Não é possível criar o VDI no SR %(sr_ref)s para a instância "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Não é possível usar o SR %(sr_ref)s para a instância %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Não é possível anexar o volume na instância %s"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s conectada à instância %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Não é possível desconectar o volume %s"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s desanexada da instância %(instance_name)s"
@@ -7146,7 +7037,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7155,59 +7046,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "O status do volume parece estar disponível"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7241,74 +7133,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7334,83 +7158,83 @@ msgstr "volume %(vol_name)s: criando lv com tamanho %(vol_size)sG"
 msgid "volume %s: creating export"
 msgstr "volume %s: criando o export"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: criado com sucesso"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr "O volume continua atachado"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr "O volume não pertence à este node"
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removendo export"
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: removendo"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: remoção realizada com sucesso"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7477,102 +7301,106 @@ msgstr "Falha ao obter metadados para o ip: %s"
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7651,11 +7479,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7736,144 +7564,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7892,6 +7679,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "tentando destruir instância já destruida: %s"
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7903,12 +7709,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7917,6 +7859,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7926,12 +7877,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr "Criando VBD para VDI %s ... "
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr "O VBD para VDI %s foi criado."
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr "Ignorando XenAPI.Failure em VBD.unplug: %s"
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "Instance %s failed to spawn - performing clean-up"
 #~ msgstr ""
 
@@ -7944,3 +7956,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "Criando VBD para VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index baf063a7a..4f4679fb7 100644
--- a/nova/locale/ru/LC_MESSAGES/nova.po
+++ b/nova/locale/ru/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
-"PO-Revision-Date: 2011-08-23 11:22+0000\n"
-"Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
+"PO-Revision-Date: 2012-03-06 12:46+0000\n"
+"Last-Translator: Eugene Marshal <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
@@ -18,14 +18,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
 #: nova/crypto.py:48
 msgid "Filename of root CA"
-msgstr ""
+msgstr "Имя файла корневого центра сертификации"
 
 #: nova/crypto.py:51
 msgid "Filename of private key"
@@ -33,7 +38,7 @@ msgstr "Имя файла секретного ключа"
 
 #: nova/crypto.py:54
 msgid "Filename of root Certificate Revocation List"
-msgstr ""
+msgstr "Имя файла корневого списка отзыва сертификатов"
 
 #: nova/crypto.py:57
 msgid "Where we keep our keys"
@@ -41,26 +46,28 @@ msgstr "Путь к ключам"
 
 #: nova/crypto.py:60
 msgid "Where we keep our root CA"
-msgstr ""
+msgstr "Место расположения нашего корневого центра сертификации"
 
 #: nova/crypto.py:63
 msgid "Should we use a CA for each project?"
-msgstr ""
+msgstr "Должны ли мы использовать центр сертификации для каждого проекта?"
 
 #: nova/crypto.py:67
 #, python-format
 msgid "Subject for certificate for users, %s for project, user, timestamp"
 msgstr ""
+"Тема для сертификатов пользователей, %s для проекта, пользователя, "
+"временной метки"
 
 #: nova/crypto.py:72
 #, python-format
 msgid "Subject for certificate for projects, %s for project, timestamp"
-msgstr ""
+msgstr "Тема для сертификатов проектов, %s для проекта, временная метка"
 
 #: nova/crypto.py:292
 #, python-format
 msgid "Flags path: %s"
-msgstr ""
+msgstr "Расположение флагов: %s"
 
 #: nova/exception.py:56
 msgid "Unexpected error while running command."
@@ -75,6 +82,11 @@ msgid ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 msgstr ""
+"%(description)s\n"
+"Команда: %(cmd)s\n"
+"Код выхода: %(exit_code)s\n"
+"Stdout: %(stdout)r\n"
+"Stderr: %(stderr)r"
 
 #: nova/exception.py:94
 msgid "DB exception wrapped."
@@ -82,7 +94,7 @@ msgstr ""
 
 #: nova/exception.py:155
 msgid "An unknown exception occurred."
-msgstr ""
+msgstr "Обнаружено неизвестное исключение."
 
 #: nova/exception.py:178
 msgid "Failed to decrypt text"
@@ -94,11 +106,13 @@ msgstr ""
 
 #: nova/exception.py:186
 msgid "Virtual Interface creation failed"
-msgstr ""
+msgstr "Ошибка создания виртуального интерфейса"
 
 #: nova/exception.py:190
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
+"5 безуспешных попыток создания виртуального интерфейса с уникальным "
+"mac-адресом"
 
 #: nova/exception.py:195
 msgid "Connection to glance failed"
@@ -110,210 +124,222 @@ msgstr ""
 
 #: nova/exception.py:203
 msgid "Not authorized."
-msgstr ""
+msgstr "Не авторизировано."
 
 #: nova/exception.py:208
 msgid "User does not have admin privileges"
-msgstr ""
+msgstr "Пользователь не имеет административных привилегий"
 
 #: nova/exception.py:212
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
-msgstr ""
+msgstr "Политика не допускает выполнения %(action)s."
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "Ядро не найдено для образа %(image_id)s."
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
-msgstr ""
+msgstr "Недопустимые параметры."
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
-msgstr ""
+msgstr "Недопустимый запрос."
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
-msgstr ""
+msgstr "Недопустимая подпись %(signature)s для пользователя %(user)s."
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
-msgstr ""
+msgstr "Недопустимый тип копии %(instance_type)s."
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
-msgstr ""
+msgstr "Недопустимый тип тома"
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
-msgstr ""
+msgstr "Недопустимый том"
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
-msgstr ""
+msgstr "Недопустимый диапазон портов %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
-msgstr ""
+msgstr "Недопустимый протокол IP %(protocol)s."
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
-msgstr ""
+msgstr "Недопустимый тип содержимого %(content_type)s."
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
-msgstr ""
+msgstr "Недопустимый cidr %(cidr)s."
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
-#, python-format
+#: nova/exception.py:301
+#, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
-msgstr ""
+msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
+"Копия %(instance_uuid)s в %(attr)s %(state)s. Невозможно %(method)s во "
+"время нахождения копии в этом состоянии."
 
-#: nova/exception.py:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
-msgstr ""
+msgstr "Копия %(instance_id)s не выполняется."
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
-msgstr ""
+msgstr "Копия %(instance_id)s не переведена в режим приостановления."
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
-msgstr ""
+msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
-msgstr ""
+msgstr "Ошибка приостановления копии"
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
-msgstr ""
+msgstr "Ошибка возобновления работы сервера"
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
-msgstr ""
+msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+#, fuzzy
+msgid "Failed to terminate instance"
+msgstr "Ошибка перезагрузки копии"
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
-msgstr ""
+msgstr "В данный момент служба недоступна."
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
-msgstr ""
+msgstr "Служба томов в данный момент недоступна."
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
-msgstr ""
+msgstr "Служба Compute недоступна в настоящее время."
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
-msgstr ""
+msgstr "Невозможно переместить копию (%(instance_id)s) на текущий узел (%(host)s)."
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
-msgstr ""
+msgstr "Назначенный узел compute недоступен в настоящее время."
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
-msgstr ""
+msgstr "Исходный узел compute недоступен в настоящее время."
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
-msgstr ""
+msgstr "Копии необходима новая версия гипервизора, вместо предоставленной."
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
-msgstr ""
+msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:373
-#, python-format
+#: nova/exception.py:381
+#, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
-msgstr ""
+msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
-msgstr ""
+msgstr "Недопустимые сведения ЦПУ"
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
-msgstr ""
+msgstr "%(address)s не является допустимым IP-адресом в4/6."
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -321,631 +347,634 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
-msgstr ""
+msgstr "Форматирование диска %(disk_format)s недопустимо"
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
-msgstr ""
+msgstr "Ec2 id %(ec2_id)s недопустим."
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
-msgstr ""
+msgstr "Ресурс не может быть найден."
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
-msgstr ""
+msgstr "Необходимый флаг %(flag)s не назначен."
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
-msgstr ""
+msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
-msgstr ""
+msgstr "Не найден том для копии %(instance_id)s."
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
-msgstr ""
+msgstr "Том %(volume_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
-msgstr ""
+msgstr "Тип тома %(volume_type_id)s не может быть найден."
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
-msgstr ""
+msgstr "Тип тома под названием %(volume_type_name)s не может быть найден."
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
+"Тип тома %(volume_type_id)s не имеет дополнительных особенностей с ключом"
+" %(extra_specs_key)s."
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
-msgstr ""
+msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
-msgstr ""
+msgstr "удаление тома %(volume_name)s, который имеет снимок"
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
-msgstr ""
+msgstr "Отсутствует диск в %(location)s"
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
-msgstr ""
+msgstr "Невозможно найти обработчик для тома %(driver_type)s."
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
-msgstr ""
+msgstr "Недопустимый образ href %(image_href)s."
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
-msgstr ""
+msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
-msgstr ""
+msgstr "Ядро не найдено для образа %(image_id)s."
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
-msgstr ""
+msgstr "Пользователь %(user_id)s не найден."
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
-msgstr ""
+msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
-msgstr ""
+msgstr "Пользователь %(user_id)s не является участником проекта %(project_id)s."
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
-msgstr ""
+msgstr "Полномочия %(role_id)s не могут быть найдены."
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
-msgstr ""
+msgstr "Невозможно найти SR для чтения/записи VDI."
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
-msgstr ""
+msgstr "%(req)s необходимо для создания сети."
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
-msgstr ""
+msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
-msgstr ""
+msgstr "Сеть не может быть найдена для моста %(bridge)s"
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
-msgstr ""
+msgstr "Сеть не может быть найдена для uuid %(uuid)s"
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
-msgstr ""
+msgstr "Сеть не найдена с cidr %(cidr)s."
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
-msgstr ""
+msgstr "Сеть не найдена для копии %(instance_id)s."
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
-msgstr ""
+msgstr "Сети не определены."
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
+"Или uuid %(network_uuid)s сети не предоставлено или не присвоено проекту "
+"%(project_id)s."
 
-#: nova/exception.py:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
-msgstr ""
+msgstr "Узел не назначен сети (%(network_id)s)."
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
-msgstr ""
+msgstr "Сертификат %(certificate_id)s не найден."
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
-msgstr ""
+msgstr "Служба %(service_id)s не найдена."
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
-msgstr ""
+msgstr "Узел %(host)s не найден."
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
-msgstr ""
+msgstr "Ключ доступа %(access_key)s не найден."
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
-msgstr ""
+msgstr "Квота не найдена"
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
-msgstr ""
+msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, fuzzy, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr "Класс %(class_name)s не найден: %(exception)s"
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
-msgstr ""
+msgstr "Группа безопасности %(security_group_id)s не найдена."
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
+"Группа безопасности %(security_group_id)s не найдена для проекта "
+"%(project_id)s."
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
-msgstr ""
+msgstr "Группа безопасности с правилом %(rule_id)s не найдена."
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
+"Группа безопасности %(security_group_id)s уже ассоциирована с копией "
+"%(instance_id)s"
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
+"Группа безопасности %(security_group_id)s не ассоциирована с копией "
+"%(instance_id)s"
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
-msgstr ""
+msgstr "Перемещение %(migration_id)s не найдено."
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
-msgstr ""
+msgstr "Перемещение не найдено для копии %(instance_id)s в состоянии %(status)s."
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
-msgstr ""
+msgstr "Консоль %(console_id)s не найдена."
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
-msgstr ""
+msgstr "Консоль для копии %(instance_id)s не найдена."
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
-msgstr ""
+msgstr "Консоль для копии %(instance_id)s в пуле %(pool_id)s не найдена."
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
-msgstr ""
+msgstr "Недопустимый тип консоли %(console_type)s "
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
-msgstr ""
+msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
-msgstr ""
+msgstr "Тип копии с названием %(instance_type_name)s не найден."
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
-#, python-format
+#: nova/exception.py:776
+#, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
-msgstr ""
+msgstr "Зона %(zone_id)s не найдена."
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
-msgstr ""
+msgstr "Копия %(instance_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
-msgstr ""
+msgstr "Объект LDAP не найден"
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
-msgstr ""
+msgstr "Пользователь LDAP %(user_id)s не найден."
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
-msgstr ""
+msgstr "Группа LDAP %(group_id)s не найдена."
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
-msgstr ""
+msgstr "Пользователь LDAP %(user_id)s не является участником группы %(group_id)s."
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
-msgstr ""
+msgstr "Файл %(file_path)s не может быть найден."
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
+"Не найден виртуальный переключатель ассоциированный с сетевым адаптером "
+"%(adapter)s."
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
-msgstr ""
+msgstr "Сетевой адаптер %(adapter)s не может быть найден."
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
-msgstr ""
+msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
-msgstr ""
+msgstr "Действие не разрешено."
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
-msgstr ""
+msgstr "Невозможно использовать глобальные полномочия %(role_id)s"
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
-msgstr ""
+msgstr "Пользователь %(user)s уже существует."
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
-msgstr ""
+msgstr "Пользователь LDAP %(user)s уже существует."
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
-msgstr ""
+msgstr "Группа LDAP %(group)s уже существует."
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
-msgstr ""
+msgstr "Пользователь %(uid)s уже является участником группы %(group_dn)s"
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
-msgstr ""
+msgstr "Проект %(project)s уже существует."
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
-msgstr ""
+msgstr "Копия %(name)s уже существует."
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
-msgstr ""
+msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
-msgstr ""
+msgstr "Ошибка перемещения"
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
-msgstr ""
-
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
+msgstr "Неправильное тело сообщения: %(reason)s"
 
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
-msgstr ""
+msgid "Could not find config at %(path)s"
+msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
 msgid "When resizing, instances must change size!"
-msgstr ""
+msgstr "При изменении размера, копии должны изменить размер!"
 
 #: nova/exception.py:922
 msgid "Image is larger than instance type allows"
-msgstr ""
+msgstr "Образ больше, чем допустимо для этого типа копии"
 
 #: nova/exception.py:926
 msgid "1 or more Zones could not complete the request"
-msgstr ""
+msgstr "1-а или несколько зон не могут завершить запрос"
 
 #: nova/exception.py:930
 msgid "Instance type's memory is too small for requested image."
@@ -958,7 +987,7 @@ msgstr ""
 #: nova/exception.py:938
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
-msgstr ""
+msgstr "Недостаточно памяти на узле сети compute для запуска %(uuid)s."
 
 #: nova/exception.py:942
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
@@ -967,12 +996,12 @@ msgstr ""
 #: nova/exception.py:946
 #, python-format
 msgid "No valid host was found. %(reason)s"
-msgstr ""
+msgstr "Допустимый узел не найден. %(reason)s"
 
 #: nova/exception.py:950
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
-msgstr ""
+msgstr "Узел %(host)s не работает или не существует."
 
 #: nova/exception.py:954
 msgid "Quota exceeded"
@@ -1024,6 +1053,8 @@ msgstr ""
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
+"Невозможно создать volume_type с именем %(name)s и спецификациями "
+"%(extra_specs)s"
 
 #: nova/exception.py:997
 msgid "Unable to create instance type"
@@ -1051,13 +1082,18 @@ msgstr ""
 #: nova/exception.py:1017
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
-msgstr ""
+msgstr "Копия %(instance_id)s не найдена."
 
 #: nova/exception.py:1021
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, fuzzy, python-format
+msgid "Could not fetch image %(image)s"
+msgstr "Получение образа %(image)s"
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1067,16 +1103,18 @@ msgstr ""
 #, python-format
 msgid "Skipping %(full_task_name)s, %(ticks_to_skip)s ticks left until next run"
 msgstr ""
+"Пропуск %(full_task_name)s, %(ticks_to_skip)s раз осталось, для "
+"произведения следующего запуска"
 
 #: nova/manager.py:152
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
-msgstr ""
+msgstr "Запуск повторяющегося задания %(full_task_name)s"
 
 #: nova/manager.py:159
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
-msgstr ""
+msgstr "Ошибка во время %(full_task_name)s: %(e)s"
 
 #: nova/manager.py:203
 msgid "Notifying Schedulers of capabilities ..."
@@ -1090,218 +1128,222 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
-msgstr ""
+msgstr "Запуск узла сети (версия %(vcs_string)s) %(topic)s"
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
-msgstr ""
+msgstr "Служба завершила работу из-за отсутствия записи базы данных"
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr "Объект сервиса в базе данных отсутствует, Повторное создание."
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
-msgstr ""
+msgstr "Полный набор ФЛАГОВ:"
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "Вложенное исключение: %s"
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
-msgstr ""
+msgstr "Получение %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
-msgstr ""
+msgstr "Приняты неизвестные аргументы ключевого слова для utils.execute: %r"
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
-msgstr ""
+msgstr "Выполнение команды (субпроцесс): %s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "Результат %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
-msgstr ""
+msgstr "%r ошибка. Выполняется повтор."
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
-msgstr ""
+msgstr "Выполнение команды (SSH): %s"
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
-msgstr ""
+msgstr "Среда не поддерживается с использованием SSH"
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
-msgstr ""
+msgstr "process_input не поддерживается с использованием SSH"
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
-msgstr ""
+msgstr "отладка в обратном вызове: %s"
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
-msgstr ""
+msgstr "Недопустимый внутренний интерфейс: %s"
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
-msgstr ""
+msgstr "внутренний интерфейс %s"
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
-msgstr ""
+msgstr "Ожидался объект типа: %s"
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
-msgstr ""
+msgstr "Недопустимая server_string: %s"
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
-msgstr ""
+msgstr "timefunc: '%(name)s' заняла %(total_time).2f с."
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
-msgstr ""
+msgstr "Исходное исключение было сброшено"
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
-msgstr ""
+msgstr "Класс %(fullname)s устарел: %(msg)s"
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
-msgstr ""
+msgstr "Класс %(fullname)s устарел"
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
-msgstr ""
+msgstr "Функция %(name)s в %(location)s устарела: %(msg)s"
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
-msgstr ""
+msgstr "Функция %(name)s в %(location)s устарела"
 
-#: nova/utils.py:1564
-#, python-format
+#: nova/utils.py:1667
+#, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
-msgstr ""
+msgstr "Ошибка удаления контейнера: %s"
 
 #: nova/wsgi.py:93
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
-msgstr ""
+msgstr "Выполняется %(name)s на %(host)s:%(port)s"
 
 #: nova/wsgi.py:104
 msgid "Stopping WSGI server."
-msgstr ""
+msgstr "Выполняется останов сервера WSGI."
 
 #: nova/wsgi.py:107
 msgid "Stopping raw TCP server."
-msgstr ""
+msgstr "Выполняется останов сервера TCP."
 
 #: nova/wsgi.py:113
 #, python-format
 msgid "Starting TCP server %(arg0)s on %(host)s:%(port)s"
-msgstr ""
+msgstr "Запуск TCP сервера %(arg0)s на %(host)s:%(port)s"
 
 #: nova/wsgi.py:129
 msgid "WSGI server has stopped."
-msgstr ""
+msgstr "Сервер WSGI был остановлен."
 
 #: nova/wsgi.py:207
 msgid "You must implement __call__"
@@ -1309,13 +1351,18 @@ msgstr ""
 
 #: nova/api/direct.py:218
 msgid "not available"
-msgstr ""
+msgstr "недоступно"
 
 #: nova/api/direct.py:299
 #, python-format
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1349,97 +1396,99 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Ошибка аутентификации: %s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
-msgstr ""
+msgstr "Запрос аутентификации для %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr "действие: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
+"Неавторизированный запрос для контроллера=%(controller)s и "
+"действия=%(action)s"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, fuzzy, python-format
 msgid "ValidatorError raised: %s"
 msgstr "Не допустимая подпись для пользователя %s"
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 "Произошла неизвестная ошибка. Пожалуйста, попытайтесь повторить ваш "
@@ -1449,176 +1498,250 @@ msgstr ""
 #, python-format
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
+"Неподдерживаемый запрос API: контроллер = %(controller)s, действие = "
+"%(action)s"
 
 #: nova/api/ec2/cloud.py:337
 #, python-format
 msgid "Create snapshot of volume %s"
+msgstr "Создать снимок тома %s"
+
+#: nova/api/ec2/cloud.py:373
+#, fuzzy, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+"Значение (%s) для параметра GroupName недопустимо. Содержание ограничено "
+"буквенно-цифровыми символами, пробелами, тире и подчёркиваниями."
+
+#: nova/api/ec2/cloud.py:379
+#, fuzzy, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
+"Значение (%s) для параметра GroupName недопустимо. Длина превышает "
+"максимально допустимое значение 255."
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr "Создание пары ключей %s"
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
-msgstr ""
+msgstr "Импортировать ключ %s"
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Удаление пары ключей %s"
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
+#, fuzzy, python-format
 msgid "Invalid CIDR"
+msgstr "Недопустимый cidr %(cidr)s."
+
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, fuzzy, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr "Недостаточно параметров для сбора правильного правила."
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
+msgstr "Отсутствует правило для заданных параметров."
+
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:723
+#, fuzzy, python-format
+msgid "%s - This rule already exists in group"
+msgstr "Это правило уже существует в группе %s"
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
+"Значение (%s) для параметра GroupName недопустимо. Содержание ограничено "
+"буквенно-цифровыми символами, пробелами, тире и подчёркиваниями."
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
+"Значение (%s) для параметра GroupName недопустимо. Длина превышает "
+"максимально допустимое значение 255."
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
-msgstr ""
+msgstr "Создать группу безопасности %s"
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr "группа %s уже существует"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
-msgstr ""
+msgstr "Удалить группу безопасности %s"
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
-msgstr ""
+msgstr "Получить консольный вывод для копии %s"
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
-msgstr ""
+msgstr "Создать том из снимка %s"
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Создание раздела %s ГБ"
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+#, fuzzy
+msgid "Delete Failed"
+msgstr "Ошибка создания"
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
-msgstr ""
+msgstr "Подключить том %(volume_id)s для копии %(instance_id)s на %(device)s"
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+#, fuzzy
+msgid "Attach Failed."
+msgstr "Ошибка создания"
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
-msgstr ""
+msgstr "Отсоединить том %s"
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+#, fuzzy, python-format
+msgid "Detach Volume Failed."
+msgstr "Отсоединить том %s"
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "аттрибут не поддерживается: %s"
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
-msgstr ""
+msgstr "Выделить адрес"
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
-msgstr ""
+msgstr "Присвоить адрес %s"
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
-msgstr ""
+msgstr "Присвоить адрес %(public_ip)s копии %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
-msgstr ""
+msgstr "Исключить адрес %s"
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
-msgstr ""
+msgstr "Образ должен быть доступен"
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
-msgstr ""
+msgstr "Выполнение завершения работы копий"
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
-msgstr ""
+msgstr "Перезагрузить копию %r"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
-msgstr ""
+msgstr "Выполнение остановки копий"
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
-msgstr ""
+msgstr "Выполнение запуска копий"
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
+msgstr "Исключение регистрации образа %s"
+
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
-msgstr ""
+msgstr "Зарегистрированный образ %(image_location)s с идентификатором %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr "не указан пользователь или группа"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
-msgstr ""
+msgstr "поддерживается только группа \"все(all)\""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
+msgstr "Обновление осведомлённости об образе %s"
+
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
-msgstr ""
+msgstr "Невозможно остановить копию в течении %d с."
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr "Ошибка получения метаданных для ip: %s"
@@ -1626,12 +1749,12 @@ msgstr "Ошибка получения метаданных для ip: %s"
 #: nova/api/openstack/__init__.py:43
 #, python-format
 msgid "Caught error: %s"
-msgstr ""
+msgstr "Обнаружена ошибка: %s"
 
 #: nova/api/openstack/__init__.py:45 nova/api/openstack/wsgi.py:886
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
-msgstr ""
+msgstr "%(url)s возвратил с HTTP %(status)d"
 
 #: nova/api/openstack/__init__.py:94
 msgid "Must specify an ExtensionManager class"
@@ -1640,7 +1763,7 @@ msgstr ""
 #: nova/api/openstack/__init__.py:105
 #, python-format
 msgid "Extended resource: %s"
-msgstr ""
+msgstr "Расширенный ресурс: %s"
 
 #: nova/api/openstack/__init__.py:130
 #, python-format
@@ -1648,21 +1771,23 @@ msgid ""
 "Extension %(ext_name)s: Cannot extend resource %(collection)s: No such "
 "resource"
 msgstr ""
+"Расширение %(ext_name)s: Невозможно расширить ресурс %(collection)s: Нет "
+"такого ресурса"
 
 #: nova/api/openstack/__init__.py:135
 #, python-format
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
-msgstr ""
+msgstr "Расширение %(ext_name)s расширение ресурса: %(collection)s"
 
 #: nova/api/openstack/auth.py:90
 #, python-format
 msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
+msgstr "%(user_id)s не может быть найден с токеном '%(token)s'"
 
 #: nova/api/openstack/auth.py:134
 #, python-format
 msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
+msgstr "%(user_id)s должен быть администратором или участником %(project_id)s"
 
 #: nova/api/openstack/auth.py:152
 msgid "Authentication requests must be made against a version root (e.g. /v2)."
@@ -1671,74 +1796,84 @@ msgstr ""
 #: nova/api/openstack/auth.py:167
 #, python-format
 msgid "Could not find %s in request."
-msgstr ""
+msgstr "В запросе невозможно найти %s."
 
 #: nova/api/openstack/auth.py:191
 #, python-format
 msgid "Successfully authenticated '%s'"
-msgstr ""
+msgstr "Аутентификация '%s' выполнена"
 
 #: nova/api/openstack/auth.py:241
 msgid "User not found with provided API key."
-msgstr ""
+msgstr "Не найден пользователь с предоставленным API ключом."
 
 #: nova/api/openstack/auth.py:258
 #, python-format
 msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
+msgstr "Предоставленный ключ API допустим, но не для пользователя '%(username)s'"
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
-msgstr ""
+msgstr "маркер [%s] не найден"
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
-msgstr ""
+msgstr "href %s не содержит версию"
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, fuzzy, python-format
+msgid "Converted networks: %s"
+msgstr "Непредвиденная ошибка: %s"
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
-msgstr ""
+msgstr "Невозможно '%(action)s', когда копия в %(attr)s %(state)s"
 
 #: nova/api/openstack/common.py:337
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
-msgstr ""
+msgstr "Копия в недопустимом состоянии для '%(action)s'"
 
 #: nova/api/openstack/common.py:417
 msgid "Rejecting snapshot request, snapshots currently disabled"
-msgstr ""
+msgstr "Отклонение запроса снимка, снимки в данный момент отключены"
 
 #: nova/api/openstack/common.py:419
 msgid "Instance snapshots are not permitted at this time."
-msgstr ""
+msgstr "Снимки копии в настоящий момент недопустимы."
 
 #: nova/api/openstack/extensions.py:188
 #, python-format
 msgid "Loaded extension: %s"
-msgstr ""
+msgstr "Загруженное расширение: %s"
 
 #: nova/api/openstack/extensions.py:225
 #, python-format
@@ -1773,7 +1908,7 @@ msgstr ""
 #: nova/api/openstack/extensions.py:246
 #, python-format
 msgid "Loading extension %s"
-msgstr ""
+msgstr "Загрузка расширения %s"
 
 #: nova/api/openstack/extensions.py:252
 #, python-format
@@ -1783,17 +1918,17 @@ msgstr ""
 #: nova/api/openstack/extensions.py:264
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
-msgstr ""
+msgstr "Ошибка загрузки расширения %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
-msgstr ""
+msgstr "Ошибка загрузки расширения %(ext_name)s: %(exc)s"
 
 #: nova/api/openstack/wsgi.py:135 nova/api/openstack/wsgi.py:538
 msgid "cannot understand JSON"
@@ -1809,9 +1944,9 @@ msgid "too many body keys"
 msgstr ""
 
 #: nova/api/openstack/wsgi.py:582
-#, python-format
+#, fuzzy, python-format
 msgid "Exception handling resource: %s"
-msgstr ""
+msgstr "Расширенный ресурс: %s"
 
 #: nova/api/openstack/wsgi.py:586
 #, python-format
@@ -1825,15 +1960,15 @@ msgstr ""
 
 #: nova/api/openstack/wsgi.py:697
 msgid "Unrecognized Content-Type provided in request"
-msgstr ""
+msgstr "В запросе предоставлен не распознанный тип-содержимого"
 
 #: nova/api/openstack/wsgi.py:701
 msgid "No Content-Type provided in request"
-msgstr ""
+msgstr "Тип содержимого не предоставлен в запросе"
 
 #: nova/api/openstack/wsgi.py:705
 msgid "Empty body provided in request"
-msgstr ""
+msgstr "Пустое тело предоставлено в запросе"
 
 #: nova/api/openstack/wsgi.py:816
 #, python-format
@@ -1846,80 +1981,80 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
-msgstr ""
+msgstr "Неправильное тело запроса"
 
 #: nova/api/openstack/wsgi.py:829
 msgid "Unsupported Content-Type"
-msgstr ""
+msgstr "Не поддерживаемый  тип содержимого"
 
 #: nova/api/openstack/wsgi.py:841
 msgid "Malformed request url"
-msgstr ""
+msgstr "Неправильный запрос url"
 
 #: nova/api/openstack/wsgi.py:889
 #, python-format
 msgid "%(url)s returned a fault: %(e)s"
-msgstr ""
+msgstr "%(url)s возвратил ошибку: %(e)s"
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
-msgstr ""
+msgstr "элемент не является потомком"
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
 #: nova/api/openstack/compute/extensions.py:29
 #: nova/api/openstack/volume/extensions.py:29
 msgid "Initializing extension manager."
-msgstr ""
+msgstr "Инициализация диспетчера расширений."
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
-msgstr ""
+msgstr "образ не найден."
 
 #: nova/api/openstack/compute/image_metadata.py:79
 msgid "Incorrect request body format"
-msgstr ""
+msgstr "Неправильный формат тела запроса"
 
 #: nova/api/openstack/compute/image_metadata.py:83
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
 #: nova/api/openstack/compute/contrib/volumetypes.py:188
 msgid "Request body and URI mismatch"
-msgstr ""
+msgstr "Тело запроса и URI не совпадают"
 
 #: nova/api/openstack/compute/image_metadata.py:86
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
 #: nova/api/openstack/compute/contrib/volumetypes.py:191
 msgid "Request body contains too many items"
-msgstr ""
+msgstr "Тело запроса содержит избыточное количество объектов"
 
 #: nova/api/openstack/compute/image_metadata.py:111
 msgid "Invalid metadata key"
-msgstr ""
+msgstr "Неправильный ключ метаданных"
 
 #: nova/api/openstack/compute/ips.py:74
 msgid "Instance does not exist"
-msgstr ""
+msgstr "Копия не существует"
 
 #: nova/api/openstack/compute/ips.py:97
 msgid "Instance is not a member of specified network"
-msgstr ""
+msgstr "Копия не является участником заданной сети"
 
 #: nova/api/openstack/compute/limits.py:140
 #, python-format
@@ -1927,6 +2062,8 @@ msgid ""
 "Only %(value)s %(verb)s request(s) can be made to %(uri)s every "
 "%(unit_string)s."
 msgstr ""
+"Только %(value)s %(verb)s запрос(ов) могут быть сделаны для %(uri)s, "
+"каждые %(unit_string)s."
 
 #: nova/api/openstack/compute/limits.py:266
 msgid "This request was rate-limited."
@@ -1936,17 +2073,17 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:122
 #: nova/api/openstack/compute/server_metadata.py:159
 msgid "Server does not exist"
-msgstr ""
+msgstr "Сервер не существует"
 
 #: nova/api/openstack/compute/server_metadata.py:141
 #: nova/api/openstack/compute/server_metadata.py:152
 msgid "Metadata item was not found"
-msgstr ""
+msgstr "Элемент метаданных не найден"
 
 #: nova/api/openstack/compute/servers.py:425
 #, python-format
 msgid "Invalid server status: %(status)s"
-msgstr ""
+msgstr "Недопустимое состояние сервера: %(status)s"
 
 #: nova/api/openstack/compute/servers.py:433
 msgid "Invalid changes-since value"
@@ -1964,182 +2101,185 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
-msgstr ""
+msgstr "Имя сервера является пустой строкой"
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
-msgstr ""
+msgstr "Недопустимый сетевой формат: сетевой uuid имеет неправильный формат (%s)"
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
-msgstr ""
+msgstr "Недопустимый фиксированный IP-адрес (%s)"
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
-msgstr ""
+msgstr "Дубликаты сетей (%s) не разрешены"
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
-msgstr ""
+msgstr "Недопустимый сетевой формат: отсутствует %s"
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
-msgstr ""
+msgstr "Недопустимый сетевой формат"
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
-msgstr ""
+msgstr "Содержимое данных пользователя не может быть дешифровано"
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
-msgstr ""
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
+msgstr "Имя сервера не задано"
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
-msgstr ""
+msgstr "Предоставлен недопустимый flavorRef."
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
-msgstr ""
+msgstr "Невозможно найти запрошенный образ"
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
-msgstr ""
+msgstr "Предоставлен недопустимый key_name."
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
-msgstr ""
+msgstr "С копией не производилось изменение размера."
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
-msgstr ""
+msgstr "Отсутствует аргумент типа 'type' для перезагрузки"
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
-msgstr ""
+msgstr "Ошибка при перезагрузке %s"
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
-msgstr ""
+msgstr "Изменение размера требует изменения объёма."
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
-msgstr ""
+msgstr "Неправильный объект сервера"
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
+msgstr "Отсутствует атрибут imageRef"
+
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
-msgstr ""
+msgstr "Отсутствует атрибут flavorRef"
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
-msgstr ""
+msgstr "adminPass не был задан"
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
-msgstr ""
+msgstr "Недопустимый adminPass"
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
-msgstr ""
+msgstr "Запрос изменения размера имеет недопустимый атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
-msgstr ""
+msgstr "Запросы изменение размера требуют атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
-msgstr ""
+msgstr "Недопустимый запрос тела"
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
-msgstr ""
+msgstr "Копия не найдена"
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
-msgstr ""
+msgstr "Недопустимые метаданные"
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
-msgstr ""
+msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:60
 #, python-format
@@ -2164,7 +2304,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:127
 #, python-format
 msgid "Error in migrate %s"
-msgstr ""
+msgstr "Ошибка перемещения %s"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:141
 #, python-format
@@ -2175,9 +2315,9 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
-msgstr ""
+msgstr "Сервер не найден"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:157
 #, python-format
@@ -2208,15 +2348,15 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
-msgstr ""
+msgstr "Копия не найдена"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:272
 msgid "host and block_migration must be specified."
@@ -2227,46 +2367,48 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
-#, python-format
+#: nova/api/openstack/compute/contrib/aggregates.py:76
+#, fuzzy, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
+"Невозможно создать volume_type с именем %(name)s и спецификациями "
+"%(extra_specs)s"
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
-#, python-format
+#: nova/api/openstack/compute/contrib/aggregates.py:114
+#, fuzzy, python-format
 msgid "Cannot update aggregate: %(id)s"
-msgstr ""
+msgstr "Ошибка обновления агента: %(resp)r"
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2297,17 +2439,18 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/extended_server_attributes.py:77
 #: nova/api/openstack/compute/contrib/extended_status.py:61
 msgid "Server not found."
-msgstr ""
+msgstr "Сервер не найден."
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
+#, fuzzy
 msgid "Flavor not found."
-msgstr ""
+msgstr "Сервер не найден."
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
 #: nova/api/openstack/compute/contrib/volumetypes.py:158
 msgid "No Request Body"
-msgstr ""
+msgstr "Нет тела запроса"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:159
 #, python-format
@@ -2320,15 +2463,15 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:204
 #: nova/api/openstack/compute/contrib/floating_ips.py:233
 msgid "Address not specified"
-msgstr ""
+msgstr "Адрес не задан"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:213
 msgid "No fixed ips associated to instance"
@@ -2341,35 +2484,35 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/hosts.py:144
 #, python-format
 msgid "Invalid status: '%s'"
-msgstr ""
+msgstr "Недопустимое состояние: '%s'"
 
 #: nova/api/openstack/compute/contrib/hosts.py:148
-#, python-format
+#, fuzzy, python-format
 msgid "Invalid mode: '%s'"
-msgstr ""
+msgstr "Недопустимое состояние: '%s'"
 
 #: nova/api/openstack/compute/contrib/hosts.py:152
 #, python-format
 msgid "Invalid update setting: '%s'"
-msgstr ""
+msgstr "Недопустимый параметр обновления: '%s'"
 
 #: nova/api/openstack/compute/contrib/hosts.py:170
-#, python-format
+#, fuzzy, python-format
 msgid "Putting host %(host)s in maintenance mode %(mode)s."
-msgstr ""
+msgstr "Перевод узла %(host)s в %(state)s."
 
 #: nova/api/openstack/compute/contrib/hosts.py:181
 #, python-format
 msgid "Setting host %(host)s to %(state)s."
-msgstr ""
+msgstr "Перевод узла %(host)s в %(state)s."
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
-msgstr ""
+msgstr "Узел не найден"
 
 #: nova/api/openstack/compute/contrib/keypairs.py:70
 msgid "Keypair name contains unsafe characters"
@@ -2386,16 +2529,16 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/multinic.py:52
 msgid "Missing 'networkId' argument for addFixedIp"
-msgstr ""
+msgstr "Отсутствует аргумент 'networkId' для addFixedIp"
 
 #: nova/api/openstack/compute/contrib/multinic.py:68
 msgid "Missing 'address' argument for removeFixedIp"
-msgstr ""
+msgstr "Отсутствует аргумент 'address' для removeFixedIp"
 
 #: nova/api/openstack/compute/contrib/multinic.py:77
 #, python-format
 msgid "Unable to find address %r"
-msgstr ""
+msgstr "Невозможно найти адрес %r"
 
 #: nova/api/openstack/compute/contrib/networks.py:62
 #, python-format
@@ -2405,23 +2548,23 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/networks.py:70
 #, python-format
 msgid "Disassociating network with id %s"
-msgstr ""
+msgstr "Исключение сети с идентификатором %s"
 
 #: nova/api/openstack/compute/contrib/networks.py:74
 #: nova/api/openstack/compute/contrib/networks.py:91
 #: nova/api/openstack/compute/contrib/networks.py:101
 msgid "Network not found"
-msgstr ""
+msgstr "Сеть не найдена"
 
 #: nova/api/openstack/compute/contrib/networks.py:87
 #, python-format
 msgid "Showing network with id %s"
-msgstr ""
+msgstr "Отображение сети с идентификатором %s"
 
 #: nova/api/openstack/compute/contrib/networks.py:97
 #, python-format
 msgid "Deleting network with id %s"
-msgstr ""
+msgstr "Удаление сети с идентификатором %s"
 
 #: nova/api/openstack/compute/contrib/scheduler_hints.py:41
 msgid "Malformed scheduler_hints attribute"
@@ -2432,13 +2575,14 @@ msgid "Security group id should be integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_groups.py:243
+#, fuzzy, python-format
 msgid "Security group is still in use"
-msgstr ""
+msgstr "Группа безопасности (%s) не найдена"
 
 #: nova/api/openstack/compute/contrib/security_groups.py:295
 #, python-format
 msgid "Security group %s already exists"
-msgstr ""
+msgstr "Группа безопасности %s уже существует"
 
 #: nova/api/openstack/compute/contrib/security_groups.py:315
 #, python-format
@@ -2448,7 +2592,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/security_groups.py:318
 #, python-format
 msgid "Security group %s cannot be empty."
-msgstr ""
+msgstr "Группа безопасности %s не может быть пустой."
 
 #: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
@@ -2462,16 +2606,11 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/security_groups.py:351
 #, python-format
 msgid "Security group (%s) not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
+msgstr "Группа безопасности (%s) не найдена"
 
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
-msgstr ""
+msgstr "Недостаточно параметров для сбора правильного правила."
 
 #: nova/api/openstack/compute/contrib/security_groups.py:376
 #, python-format
@@ -2486,29 +2625,24 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
-msgstr ""
+msgstr "Правило (%s) не найдено"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
-msgstr ""
+msgstr "Группа безопасности не задана"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
-msgstr ""
+msgstr "Наименование группы безопасности не может отсутствовать"
 
 #: nova/api/openstack/compute/contrib/server_start_stop.py:45
 #, python-format
@@ -2520,110 +2654,34 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
 msgid "vol=%s"
-msgstr ""
+msgstr "vol=%s"
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
 #: nova/api/openstack/volume/volumes.py:184
 #, python-format
 msgid "Delete volume with id: %s"
-msgstr ""
+msgstr "Удалить том с идентификатором: %s"
 
 #: nova/api/openstack/compute/contrib/volumes.py:329
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
-msgstr ""
+msgstr "Присоединить том %(volume_id)s к копии %(server_id)s на %(device)s"
 
 #: nova/api/openstack/compute/contrib/volumes.py:481
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
-msgstr ""
+msgstr "Удалить снимок с идентификатором: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
-msgstr ""
+msgstr "Создать снимок из тома %s"
 
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
@@ -2635,141 +2693,146 @@ msgid ""
 "Attempted to remove the last member of a group. Deleting the group at %s "
 "instead."
 msgstr ""
+"Попытка удаление последнего участника группы. Будет выполнено удаление "
+"группы в %s."
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
-msgstr ""
+msgstr "Поиск пользователя: %r"
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
-msgstr ""
+msgstr "Ошибка авторизации для ключа доступа %s"
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
-msgstr ""
+msgstr "ошибка авторизации: нет проекта под названием %(pjid)s (user=%(uname)s)"
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
+"Ошибка авторизации: пользователь %(uname)s не является администратором и "
+"не является участником проекта %(pjname)s"
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
-msgstr ""
+msgstr "подпись: %s"
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Не допустимая подпись для пользователя %s"
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr "Необходимо указать проект"
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
-msgstr ""
+msgstr "Добавление полномочий %(role)s для пользователя %(uid)s в проекте %(pid)s"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
-msgstr ""
+msgstr "Удаление полномочий %(role)s для пользователя %(uid)s в проекте %(pid)s"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
-msgstr ""
+msgstr "Созданный проект %(name)s с диспетчером %(manager_user)s"
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr "изменение проекта %s"
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
-msgstr ""
+msgstr "Добавление пользователя %(uid)s в проект %(pid)s"
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
-msgstr ""
+msgstr "Исключить пользователя %(uid)s из проекта %(pid)s"
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr "Удаление проекта %s"
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
-msgstr ""
+msgstr "Созданный пользователь %(rvname)s (admin: %(rvadmin)r)"
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr "Удаление пользователя %s"
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
-msgstr ""
+msgstr "Режим администратора назначен %(admin)r для пользователя %(uid)s"
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "Нет vpn данных для проекта %s"
 
 #: nova/cloudpipe/pipelib.py:46
+#, fuzzy, python-format
 msgid "Instance type for vpn instances"
-msgstr ""
+msgstr "Недопустимый тип копии %(instance_type)s."
 
 #: nova/cloudpipe/pipelib.py:49
 msgid "Template for cloudpipe instance boot script"
@@ -2788,117 +2851,136 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr "Запуск VPN для %s"
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr "Невозможно найти узел для копии %s"
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
+"Превышена квота для %(pid)s, попытка назначить %(num_metadata)s свойств "
+"метаданных"
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
+"Превышена квота для %(pid)s, превышено ключевое свойство метаданных или "
+"значение"
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+#, fuzzy
+msgid "Cannot run any more instances of this type."
 msgstr ""
+"Превышена квота копий. Вы не можете запустить дополнительные копии этого "
+"типа."
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
-msgstr ""
+#: nova/compute/api.py:259
+#, fuzzy, python-format
+msgid "Can only run %s more instances of this type."
+msgstr "Превышена квота копий. Вы можете запустить только %s копий этого типа."
 
-#: nova/compute/api.py:219
-#, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
-msgstr ""
+#: nova/compute/api.py:261
+#, fuzzy, python-format
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
+msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
-msgstr ""
+msgstr "Создание необработанной копии"
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
-msgstr ""
+msgstr "Выполняет запуск %s копий..."
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
-msgstr ""
+msgstr "bdm %s"
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
-msgstr ""
+msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
-msgstr ""
+msgstr "Отправка операции создания в расписание для %(pid)s/%(uid)s's"
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
+#, fuzzy
 msgid "Going to try to soft delete instance"
-msgstr ""
+msgstr "Выполнение запуска копий"
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
+#, fuzzy, python-format
 msgid "No host for instance, deleting immediately"
-msgstr ""
+msgstr "Отсутствует узел для копии %s, немедленное удаление"
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
+#, fuzzy, python-format
 msgid "Going to try to terminate instance"
-msgstr ""
+msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
+#, fuzzy, python-format
 msgid "Going to try to stop instance"
-msgstr ""
+msgstr "Попытка остановить %s"
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
+#, fuzzy, python-format
 msgid "Going to try to start instance"
-msgstr ""
+msgstr "Попытка запустить %s"
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
-msgstr ""
+msgstr "Копия %(instance_uuid)s не остановлена. (%(vm_state)s"
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
-msgstr ""
+msgstr "Поиск по: %s"
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr "Тип образа не распознан %s"
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
+"Устаревший тип копии %(current_instance_type_name)s,  новый тип копии "
+"%(new_instance_type_name)s"
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2906,17 +2988,17 @@ msgstr ""
 #: nova/compute/instance_types.py:74 nova/volume/volume_types.py:41
 #, python-format
 msgid "DB error: %s"
-msgstr ""
+msgstr "Ошибка БД: %s"
 
 #: nova/compute/instance_types.py:84
 #, python-format
 msgid "Instance type %s not found for deletion"
-msgstr ""
+msgstr "Копия типа %s не найдена для выполнения удаления"
 
 #: nova/compute/manager.py:138
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
-msgstr ""
+msgstr "check_instance_lock: оформление: |%s|"
 
 #: nova/compute/manager.py:140
 #, python-format
@@ -2924,21 +3006,23 @@ msgid ""
 "check_instance_lock: arguments: |%(self)s| |%(context)s| "
 "|%(instance_uuid)s|"
 msgstr ""
+"check_instance_lock: аргументы: |%(self)s| |%(context)s| "
+"|%(instance_uuid)s|"
 
 #: nova/compute/manager.py:144
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
-msgstr ""
+msgstr "check_instance_lock: заблокирован: |%s|"
 
 #: nova/compute/manager.py:146
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
-msgstr ""
+msgstr "check_instance_lock: администратор: |%s|"
 
 #: nova/compute/manager.py:151
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
-msgstr ""
+msgstr "check_instance_lock: исполнение: |%s|"
 
 #: nova/compute/manager.py:155
 #, python-format
@@ -2948,455 +3032,474 @@ msgstr ""
 #: nova/compute/manager.py:201
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
+msgstr "Невозможно загрузить драйвер виртуализации: %s"
+
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
-msgstr ""
+msgstr "Драйвер гипервизора не поддерживает правила брандмауэра"
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
-#, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
-msgstr ""
+#: nova/compute/manager.py:406
+#, fuzzy, python-format
+msgid "Exception encountered while terminating the instance %s"
+msgstr "исключение завершает работу копии %(instance_uuid)s"
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
-msgstr ""
+msgstr "Копия %s не найдена."
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
-msgstr ""
+msgstr "Копия уже была создана"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
+"image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
+"allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
+"Образ '%(image_id)s' размером %(size_bytes)d, превышает exceeded "
+"instance_type допустимый размер %(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr ""
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
-msgstr ""
+msgstr "Пропуск DiskNotFound: %s"
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
-msgstr ""
+msgstr "завершение работы bdm %s"
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr "%s. Установка состояния копии vm_state на ERROR"
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
-msgstr ""
+msgstr "Обновление сборки %s"
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
-msgstr ""
+msgstr "Перезагрузка копии %s"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
+"попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
+"%(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
-msgstr ""
+msgstr "копия %s: выполнение снимка"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
+"попытка создания снимка не выполняемой копии: %(instance_uuid)s "
+"(состояние: %(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
-msgstr ""
+msgstr "Найдено %(num_images)d образов (ротация: %(rotation)d)"
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
-msgstr ""
+msgstr "Удаление образа %s"
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
-msgstr ""
+msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
-msgstr ""
+msgstr "Копия %s: Назначение административного пароля"
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
-msgstr ""
+msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
-msgstr ""
+msgstr "Ошибка назначения пароля администратора"
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
-msgstr ""
+msgstr "копия %(instance_uuid)s: обновление агента до %(url)s"
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
-msgstr ""
+msgstr "назначение совпадает с источником!"
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
-msgstr ""
+msgstr "копия %s: перемещение"
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
-msgstr ""
+msgstr "копия %s: приостановление"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
-msgstr ""
+msgstr "копия %s: снятие с приостановления"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
-msgstr ""
+msgstr "копия %s: принятие диагностики"
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
-msgstr ""
+msgstr "копия %s: приостановление"
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
-msgstr ""
+msgstr "копия %s: возобновление"
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
-msgstr ""
+msgstr "копия %s: блокирование"
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
-msgstr ""
+msgstr "копия %s: разблокирование"
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
-msgstr ""
+msgstr "копия %s: получение заблокированного состояния"
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
-msgstr ""
+msgstr "копия %s: сброс сети"
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
-msgstr ""
+msgstr "копия %s: получение консоли vnc"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
-#, python-format
+#: nova/compute/manager.py:1702
+#, fuzzy, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
-msgstr ""
+msgstr "копия %(instance_uuid)s: обновление агента до %(url)s"
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
-#, python-format
+#: nova/compute/manager.py:1713
+#, fuzzy, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
-msgstr ""
+msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
-msgstr ""
+msgstr "Отсоединение тома от неизвестной копии %s"
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
+"Создание временного файла %s для оповещения других узлов сети compute о "
+"необходимости присоединения того же хранилища."
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
-msgstr ""
+msgstr "plug_vifs() ошибка %(cnt)d.До %(max_retry)d попыток для %(hostname)s."
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
-msgstr ""
+msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
 msgstr ""
+"Вы можете увидеть ошибку \"libvirt: ошибка QEMU: Домен не найден: "
+"отсутствует домен с соответствующим именем.\" Эта ошибка может быть "
+"безопасно пропущена."
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
-msgstr ""
+msgstr "Обновление временных данных использования полосы пропускания"
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
-msgstr ""
+msgstr "Обновление состояния узла"
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
+"Найдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
+"гипервизоре."
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
-msgstr ""
+msgstr "FLAGS.reclaim_instance_interval <= 0, пропуск..."
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
+"Не распознанное значение '%(action)s' для "
+"FLAGS.running_deleted_instance_action"
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3409,26 +3512,26 @@ msgstr ""
 
 #: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
 msgid "Adding console"
-msgstr ""
+msgstr "Добавление консоли"
 
 #: nova/console/manager.py:97
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
-msgstr ""
+msgstr "Выполнена попытка удаления несуществующей консоли %(console_id)s."
 
 #: nova/console/vmrc_manager.py:122
 #, python-format
 msgid "Tried to remove non-existent console %(console_id)s."
-msgstr ""
+msgstr "Попытка удаления несуществующей консоли %(console_id)s."
 
 #: nova/console/vmrc_manager.py:125
 #, python-format
 msgid "Removing console %(console_id)s."
-msgstr ""
+msgstr "Удаление консоли %(console_id)s."
 
 #: nova/console/xvp.py:98
 msgid "Rebuilding xvp conf"
-msgstr ""
+msgstr "Обновление сборки xvp conf"
 
 #: nova/console/xvp.py:116
 #, python-format
@@ -3437,96 +3540,92 @@ msgstr ""
 
 #: nova/console/xvp.py:121
 msgid "Stopping xvp"
-msgstr ""
+msgstr "Выполнение останова xvp"
 
 #: nova/console/xvp.py:134
 msgid "Starting xvp"
-msgstr ""
+msgstr "Запуск xvp"
 
 #: nova/console/xvp.py:141
 #, python-format
 msgid "Error starting xvp: %s"
-msgstr ""
+msgstr "Ошибка запуска xvp: %s"
 
 #: nova/console/xvp.py:144
 msgid "Restarting xvp"
-msgstr ""
+msgstr "Выполнение перезагрузки xvp"
 
 #: nova/console/xvp.py:146
 msgid "xvp not running..."
-msgstr ""
+msgstr "xvp не выполняется..."
 
 #: nova/consoleauth/manager.py:63
 #, python-format
 msgid "Deleting Expired Token: (%s)"
-msgstr ""
+msgstr "Удаление токена с истёкшим сроком: (%s)"
 
 #: nova/consoleauth/manager.py:75
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
-msgstr ""
+msgstr "Полученный токен: %(token)s, %(token_dict)s)"
 
 #: nova/consoleauth/manager.py:79
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
-msgstr ""
+msgstr "Проверка токена: %(token)s, %(token_valid)s)"
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
-msgstr ""
+msgstr "Нераспознанное значение read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
 #: nova/db/sqlalchemy/migration.py:36
 msgid "python-migrate is not installed. Exiting."
-msgstr ""
+msgstr "python-migrate не установлен. Выход."
 
 #: nova/db/sqlalchemy/migration.py:46
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
-msgstr ""
+msgstr "столбец интерфейса не добавлен  в таблицу сетей"
 
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
-msgstr ""
+msgstr "Таблица |%s| не создана!"
 
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
 msgid "VIF column not added to fixed_ips table"
-msgstr ""
+msgstr "Столбец VIF не добавлен в таблицу fixed_ips"
 
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
 #, python-format
@@ -3546,18 +3645,18 @@ msgstr ""
 
 #: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
 msgid "priority column not added to networks table"
-msgstr ""
+msgstr "столбец приоритета не добавлен в таблицу сетей"
 
 #: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
 #: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
 #: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
 #: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
 msgid "foreign key constraint couldn't be removed"
-msgstr ""
+msgstr "ограничения внешнего ключа не могут быть удалены"
 
 #: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
 msgid "progress column not added to instances table"
-msgstr ""
+msgstr "столбец выполнения не добавлен в таблицу копий"
 
 #: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
 #, python-format
@@ -3572,190 +3671,210 @@ msgstr ""
 
 #: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
 msgid "progress column not added to compute_nodes table"
-msgstr ""
+msgstr "столбец выполнения не добавлен в таблицу compute_nodes"
 
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
-msgstr ""
+msgstr "Не владелец образа"
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
-msgstr ""
+msgstr "Ошибка загрузки %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
-msgstr ""
+msgstr "Ошибка расшифрования %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
-msgstr ""
+msgstr "Ошибка извлечения %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
-msgstr ""
+msgstr "Ошибка выгрузки %(image_location)s в %(image_path)s"
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
-msgstr ""
+msgstr "Ошибка дешифрирования личного ключа: %s"
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
-msgstr ""
+msgstr "Ошибка дешифрирования вектора инициализации: %s"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
-msgstr ""
+msgstr "Ошибка дешифрирования файла образа %(image_file)s: %(err)s"
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
-msgstr ""
+msgstr "В образе небезопасные имена файлов"
 
 #: nova/ipv6/account_identifier.py:38 nova/ipv6/rfc2462.py:34
 #, python-format
 msgid "Bad mac for to_global_ipv6: %s"
-msgstr ""
+msgstr "Недопустимый mac для to_global_ipv6: %s"
 
 #: nova/ipv6/account_identifier.py:40 nova/ipv6/rfc2462.py:36
 #, python-format
 msgid "Bad prefix for to_global_ipv6: %s"
-msgstr ""
+msgstr "Недопустимый префикс для to_global_ipv6: %s"
 
 #: nova/ipv6/account_identifier.py:42
 #, python-format
 msgid "Bad project_id for to_global_ipv6: %s"
-msgstr ""
+msgstr "Недопустимый project_id для to_global_ipv6: %s"
 
 #: nova/network/ldapdns.py:321
 msgid "This driver only supports type 'a' entries."
-msgstr ""
+msgstr "Этот драйвер поддерживает только записи типа 'a'."
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
-msgstr ""
+msgstr "Предпринята удалить цепочку %s, которая не существует"
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
-msgstr ""
+msgstr "Неизвестная цепочка: %r"
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
+"Предпринята попытка удалить правило, которого там нет: %(chain)r %(rule)r"
+" %(wrap)r %(top)r"
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
-msgstr ""
+msgstr "Запуск интерфейса VLAN %s"
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
+msgstr "Запуск моста интерфейса для %s"
+
+#: nova/network/linux_net.py:1138
+#, fuzzy, python-format
+msgid "Starting bridge %s "
+msgstr "Запуск копии %s"
+
+#: nova/network/linux_net.py:1145
+#, fuzzy, python-format
+msgid "Done starting bridge %s"
+msgstr "Ошибка запуска xvp: %s"
+
+#: nova/network/linux_net.py:1163
+#, fuzzy, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr "Ошибка отсоединения vif копии '%s'"
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
-msgstr ""
+msgstr "Интерфейс %(interface)s не найден"
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
-msgstr ""
+msgstr "Адрес |%(address)s| не выделен"
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
-msgstr ""
+msgstr "Адрес |%(address)s| не выделен вашему проекту |%(project)s|"
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
-msgstr ""
+msgstr "Превышена квота для %s, попытка выделения адреса"
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3763,125 +3882,134 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
-msgstr ""
+msgstr "Домен |%(domain)s| уже существует, изменение зоны на |%(av_zone)s|."
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
-msgstr ""
+msgstr "Домен |%(domain)s| уже существует, изменение проекта на |%(project)s|."
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
-msgstr ""
+msgstr "установка сетевого узла"
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
-msgstr ""
+msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
 "|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
 " will be created."
 msgstr ""
+"instance-dns-zone является |%(domain)s|, который располагается в "
+"доступной зоне |%(zone)s|. Копия |%(instance)s| расположена в зоне "
+"|%(zone2)s|. Запись DNS не будет создана."
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
-msgstr ""
+msgstr "Арендованный IP |%(address)s|"
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
-msgstr ""
+msgstr "Присвоенный IP |%(address)s|"
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
-msgstr ""
+msgstr "cidr уже используется"
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
+"запрошенная cidr (%(cidr)s) конфликтует с существующей супер-сетью "
+"(%(super)s)"
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
+"запрошенная cidr (%(cidr)s) конфликтует с существующей, меньшей cidr "
+"(%(smaller)s)"
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
-msgstr ""
+msgstr "Сеть уже существует!"
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
-msgstr ""
+msgstr "Сеть должна быть исключена из проекта %s перед удалением"
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
 " is %(network_size)s"
 msgstr ""
+"Сетевой диапазон недостаточен для соответствия %(num_networks)s. Размер "
+"сети %(network_size)s"
 
 #: nova/network/minidns.py:65
 msgid "This driver only supports type 'a'"
-msgstr ""
+msgstr "Этот драйвер поддерживает только тип 'a'"
 
 #: nova/network/quantum/client.py:154
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3889,19 +4017,19 @@ msgstr ""
 #: nova/network/quantum/client.py:196
 #, python-format
 msgid "Quantum entity not found: %s"
-msgstr ""
+msgstr "Объект Quantum не найден: %s"
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
-msgstr ""
+msgstr "Серверная %(status_code)s ошибка: %(data)s"
 
 #: nova/network/quantum/client.py:210
 #, python-format
 msgid "Unable to connect to server. Got error: %s"
-msgstr ""
+msgstr "Невозможно подключиться к серверу. Принята ошибка: %s"
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3934,42 +4062,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
-msgstr ""
+msgstr "сетевые распределения для копии %s"
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
-msgstr ""
+msgstr "Сервер возвратил ошибку: %s"
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3983,98 +4111,102 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:75
 msgid "Error creating network entry"
-msgstr ""
+msgstr "Ошибка создания сетевой записи"
 
 #: nova/network/quantum/nova_ipam_lib.py:90
 #, python-format
 msgid "No network with net_id = %s"
-msgstr ""
+msgstr "Нет сети с net_id = %s"
 
 #: nova/network/quantum/nova_ipam_lib.py:221
-#, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
-msgstr ""
+#, fuzzy, python-format
+msgid "No fixed IPs to deallocate for vif %s"
+msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
+"Подключение интерфейса %(interface_id)s к сети %(net_id)s для "
+"%(tenant_id)s"
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
-msgstr ""
+msgstr "Удаление порта %(port_id)s в сети %(net_id)s для %(tenant_id)s"
 
 #: nova/notifier/api.py:115
 #, python-format
 msgid "%s not in valid priorities"
-msgstr ""
+msgstr "%s не в допустимых приоритетах"
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
+"Неполадка '%(e)s', попытка отправить в систему уведомлений. "
+"Нагрузка=%(payload)s"
 
 #: nova/notifier/list_notifier.py:65
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
-msgstr ""
+msgstr "Возврат исключения %s вызывающему"
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
-msgstr ""
+msgstr "неизвлечённый контекст: %s"
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "получено %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "не определен метод для сообщения: %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "Не определен метод для сообщения: %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
-msgstr ""
+msgstr "Выполнение асинхронного вызова %s ..."
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID is %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
-msgstr ""
+msgstr "Отправка оповещения на %s..."
 
 #: nova/rpc/common.py:54
 #, python-format
@@ -4082,156 +4214,150 @@ msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
+"Удалённая ошибка: %(exc_type)s %(value)s\n"
+"%(traceback)s."
 
 #: nova/rpc/common.py:71
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
+"Сервер AMQP на %(fl_host)s:%(fl_port)d недоступен: %(e)s. Очередная "
+"попытка через %(fl_intv)d секунд."
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
+"Невозможно подключиться к серверу AMQP после выполнения %(tries)d "
+"попыток. Завершение работы."
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "Переподлючено к очереди"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
-msgstr ""
+msgstr "Ошибка получения сообщения из очереди: %s"
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "ответ %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr "тема %s"
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "сообщение %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
-msgstr ""
+msgstr "Повторное подключение к серверу AMQP на %(hostname)s:%(port)d"
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
-msgstr ""
+msgstr "Подключение к серверу AMQP на %(hostname)s:%(port)d"
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
+"Невозможно подключиться к серверу AMQP на %(hostname)s:%(port)d после "
+"%(max_retries)d попыток: %(err_str)s"
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
+"AMQP сервер на %(hostname)s:%(port)d недоступен: %(err_str)s. Повторная "
+"попытка через %(sleep_time)d секунд."
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
-msgstr ""
+msgstr "Ошибка объявления потребителю темы '%(topic)s': %(err_str)s"
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
-msgstr ""
+msgstr "Ошибка принятия сообщения из очереди: %s"
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
-msgstr ""
+msgstr "Ошибка публикации сообщения в тему '%(topic)s': %(err_str)s"
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
-msgstr ""
+msgstr "Невозможно подключиться к серверу AMQP: %s "
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
-msgstr ""
+msgstr "Выполняется ли соответствующая служба?"
 
 #: nova/scheduler/chance.py:52
 msgid "Could not find another compute"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
+msgstr "Невозможно найти другой compute"
 
 #: nova/scheduler/driver.py:63
 #, python-format
@@ -4257,182 +4383,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
-msgstr ""
+msgstr "узел %(dest)s несовместим с исходным узлом %(src)s."
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
-#, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
-msgstr ""
+msgid "Attempting to build %(num_instances)d instance(s)"
+msgstr "Попытка собрать %(num_instances)d копию(й)"
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
-msgstr ""
+msgid "Filtered %(hosts)s"
+msgstr "Отфильтрованы %(hosts)s"
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
-#, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
-msgstr ""
+#: nova/scheduler/host_manager.py:163
+#, fuzzy, python-format
+msgid "Host filter passes for %(host)s"
+msgstr "Отфильтрованы %(hosts)s"
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
-msgstr ""
+msgid "Received %(service_name)s service update from %(host)s."
+msgstr "Принято служебное обновление для %(service_name)s от %(host)s."
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
-msgstr ""
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
+msgstr "host_manager реализован только для 'compute'"
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
-msgstr ""
+msgid "No service for compute ID %s"
+msgstr "Нет службы для compute ID %s"
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
-msgstr ""
+msgid "Failed to schedule_%(method)s: %(ex)s"
+msgstr "Ошибка schedule_%(method)s: %(ex)s"
 
-#: nova/scheduler/vsa.py:391
-#, python-format
-msgid "No capability selected for volume of size %(size)s"
-msgstr ""
+#: nova/scheduler/manager.py:159
+#, fuzzy, python-format
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgstr "Копия %(instance_uuid)s не остановлена. (%(vm_state)s"
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
-msgstr ""
+msgid "Could not decode scheduler options: '%(e)s'"
+msgstr "Невозможно декодировать параметры расписания: '%(e)s'"
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4467,12 +4546,12 @@ msgstr ""
 #: nova/testing/fake/rabbit.py:133
 #, python-format
 msgid "Getting from %(queue)s: %(message)s"
-msgstr ""
+msgstr "Получение из %(queue)s: %(message)s"
 
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
-msgstr ""
+msgstr "Имитация выполнения команды (субпроцесс): %s"
 
 #: nova/tests/fake_utils.py:80
 #, python-format
@@ -4482,41 +4561,41 @@ msgstr ""
 #: nova/tests/fake_utils.py:96
 #, python-format
 msgid "Faked command raised an exception %s"
-msgstr ""
+msgstr "Имитация команды привела к исключению %s"
 
 #: nova/tests/fake_utils.py:101
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
-msgstr ""
+msgstr "Ответ на имитацию команды в stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
-msgstr ""
+msgstr "Выполняемые копии: %s"
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
-msgstr ""
+msgstr "После завершения работы копий: %s"
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
-msgstr ""
+msgstr "Внутренняя ошибка"
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
-msgstr ""
+msgstr "После принудительного завершения работы копий: %s"
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4529,11 +4608,11 @@ msgstr ""
 
 #: nova/tests/test_nova_manage.py:170
 msgid "IPv4"
-msgstr ""
+msgstr "IPv4"
 
 #: nova/tests/test_nova_manage.py:171
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #: nova/tests/test_nova_manage.py:172
 msgid "start address"
@@ -4553,7 +4632,7 @@ msgstr ""
 
 #: nova/tests/test_nova_manage.py:176
 msgid "project"
-msgstr ""
+msgstr "проект"
 
 #: nova/tests/test_nova_manage.py:177
 msgid "uuid"
@@ -4567,98 +4646,82 @@ msgstr ""
 #: nova/tests/test_volume.py:425
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
-msgstr ""
+msgstr "Невозможно подтвердить идентификатор экспортированного тома:%s."
 
 #: nova/tests/test_volume_types.py:58
 #, python-format
 msgid "Given data: %s"
-msgstr ""
+msgstr "Заданные данные: %s"
 
 #: nova/tests/test_volume_types.py:59
 #, python-format
 msgid "Result data: %s"
-msgstr ""
+msgstr "Итоговые данные: %s"
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
-#, python-format
-msgid "Test: user_data = %s"
-msgstr ""
-
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:621
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
-msgstr ""
+msgstr "Создание файлов в %s для имитации гостевого агента"
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/test_xenapi.py:632
 #, python-format
 msgid "Removing simulated guest agent files in %s"
+msgstr "Удаление файлов имитации гостевого агента в %s"
+
+#: nova/tests/api/openstack/compute/test_servers.py:2102
+#, python-format
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
 #, python-format
 msgid "_create: %s"
-msgstr ""
+msgstr "_создать: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
-msgstr ""
+msgstr "_удалить: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
-msgstr ""
+msgstr "_get: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
-msgstr ""
+msgstr "_get_all: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
 #, python-format
 msgid "test_snapshot_create: param=%s"
-msgstr ""
+msgstr "test_snapshot_create: param=%s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
-msgstr ""
+msgstr "test_snapshot_create: resp_dict=%s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
-msgstr ""
+msgstr "test_snapshot_create_force: param=%s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
-msgstr ""
+msgstr "test_snapshot_create_force: resp_dict=%s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
 #, python-format
 msgid "test_snapshot_show: resp=%s"
-msgstr ""
+msgstr "test_snapshot_show: resp=%s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
-msgstr ""
-
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
+msgstr "test_snapshot_detail: resp_dict=%s"
 
 #: nova/tests/integrated/test_login.py:31
 #, python-format
@@ -4672,122 +4735,85 @@ msgid ""
 "Status Code: %(_status)s\n"
 "Body: %(_body)s"
 msgstr ""
+"%(message)s\n"
+"Код состояния: %(_status)s\n"
+"Тело: %(_body)s"
 
 #: nova/tests/integrated/api/client.py:47
 msgid "Authentication error"
-msgstr ""
+msgstr "Ошибка аутентификации"
 
 #: nova/tests/integrated/api/client.py:55
 msgid "Authorization error"
-msgstr ""
+msgstr "Ошибка авторизации"
 
 #: nova/tests/integrated/api/client.py:63
 msgid "Item not found"
-msgstr ""
+msgstr "объект не найден"
 
 #: nova/tests/integrated/api/client.py:105
 #, python-format
 msgid "Doing %(method)s on %(relative_url)s"
-msgstr ""
+msgstr "Выполнение %(method)s на %(relative_url)s"
 
 #: nova/tests/integrated/api/client.py:107
 #, python-format
 msgid "Body: %s"
-msgstr ""
+msgstr "Тело: %s"
 
 #: nova/tests/integrated/api/client.py:125
 #, python-format
 msgid "%(auth_uri)s => code %(http_status)s"
-msgstr ""
+msgstr "%(auth_uri)s => код %(http_status)s"
 
 #: nova/tests/integrated/api/client.py:151
 #, python-format
 msgid "%(relative_uri)s => code %(http_status)s"
-msgstr ""
+msgstr "%(relative_uri)s => код %(http_status)s"
 
 #: nova/tests/integrated/api/client.py:161
 msgid "Unexpected status code"
-msgstr ""
+msgstr "Непредвиденный код состояния"
 
 #: nova/tests/integrated/api/client.py:168
 #, python-format
 msgid "Decoding JSON: %s"
-msgstr ""
+msgstr "Декодирование JSON: %s"
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
-msgstr ""
+msgstr "Ошибка открытия соединения c гипервизором"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
-msgstr ""
+msgstr "Запись Compute_service создана для %s "
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
-msgstr ""
+msgstr "Запись Compute_service обновлена для %s "
 
 #: nova/virt/firewall.py:130
 #, python-format
@@ -4801,100 +4827,97 @@ msgstr ""
 
 #: nova/virt/firewall.py:139
 msgid "Provider Firewall Rules refreshed"
-msgstr ""
+msgstr "Выполненое обновление правил брандмауэра поставщика"
 
 #: nova/virt/firewall.py:291
 #, python-format
 msgid "Adding security group rule: %r"
-msgstr ""
+msgstr "Добавление правила группы безопасности: %r"
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
-msgstr ""
+msgstr "Добавление правила поставщика: %s"
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
-msgstr ""
+msgstr "Ошибка анализа 'qemu-img info'."
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
-msgstr ""
+msgstr "Преобразование в необработанный, но текущий формат %s"
 
 #: nova/virt/vmwareapi_conn.py:105
 msgid ""
 "Must specify vmwareapi_host_ip,vmwareapi_host_username and "
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
+"Необходимо указать vmwareapi_host_ip,vmwareapi_host_username и "
+"vmwareapi_host_password useconnection_type=vmwareapi"
 
 #: nova/virt/vmwareapi_conn.py:276
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
-msgstr ""
+msgstr "В vmwareapi:_create_session, принято это исключение: %s"
 
 #: nova/virt/vmwareapi_conn.py:359
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
-msgstr ""
+msgstr "В vmwareapi:_call_method, принято это исключение: %s"
 
 #: nova/virt/vmwareapi_conn.py:398
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
-msgstr ""
+msgstr "Состояние задачи [%(task_name)s] %(task_ref)s: готово"
 
 #: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
-msgstr ""
+msgstr "Состояние задачи [%(task_name)s] %(task_ref)s: ошибка %(error_info)s"
 
 #: nova/virt/vmwareapi_conn.py:409
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
-msgstr ""
+msgstr "В vmwareapi:_poll_task, принята эта ошибка %s"
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
+"Необходимо указать xenapi_connection_url, xenapi_connection_username "
+"(необязательно) и xenapi_connection_password для использования "
+"connection_type=xenapi"
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
-msgstr ""
+msgstr "Запуск узла на XenServer не поддерживается."
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
+"Невозможно выполнить вход в XenAPI (недостаточно свободного места на "
+"Dom0?)"
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
-msgstr ""
+msgstr "Исключение: %s"
 
 #: nova/virt/baremetal/dom.py:93
 msgid "No domains exist."
@@ -4938,7 +4961,7 @@ msgstr ""
 #: nova/virt/baremetal/dom.py:154
 #, python-format
 msgid "No such domain %s"
-msgstr ""
+msgstr "Домен %s не существует"
 
 #: nova/virt/baremetal/dom.py:161
 #, python-format
@@ -5012,7 +5035,7 @@ msgstr ""
 #: nova/virt/baremetal/proxy.py:162
 #, python-format
 msgid "instance %(instance_name)s: deleting instance files %(target)s"
-msgstr ""
+msgstr "копия %(instance_name)s: удаление файлов копии %(target)s"
 
 #: nova/virt/baremetal/proxy.py:189
 #, python-format
@@ -5072,9 +5095,9 @@ msgstr ""
 #: nova/virt/baremetal/proxy.py:354
 #, python-format
 msgid "instance %s: Creating image"
-msgstr ""
+msgstr "копия %s: Создание образа"
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5096,11 +5119,13 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
+"Невозможно получить количество ЦПУ, так как эта возможность не "
+"реализована для этой платформы. Эту ошибку можно безопасно пропустить."
 
 #: nova/virt/baremetal/proxy.py:714
 #, python-format
@@ -5111,8 +5136,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5137,44 +5162,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
-msgstr ""
+msgstr "нет настроенного совместимого обработчика образа"
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
-msgstr ""
+msgstr "неизвестный обработчик образа диска: %s"
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
-msgstr ""
+msgstr "образ уже присоединён"
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "Ошибка монтирования файловой системы: %s"
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
-msgstr ""
+msgstr "Ошибка удаления контейнера: %s"
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5182,7 +5221,7 @@ msgstr ""
 #: nova/virt/disk/guestfs.py:39
 #, python-format
 msgid "unsupported partition: %s"
-msgstr ""
+msgstr "неподдерживаемый раздел: %s"
 
 #: nova/virt/disk/guestfs.py:77
 msgid "unknown guestmount error"
@@ -5191,11 +5230,11 @@ msgstr ""
 #: nova/virt/disk/loop.py:30
 #, python-format
 msgid "Could not attach image to loopback: %s"
-msgstr ""
+msgstr "Невозможно прикрепить образ для замыкания: %s"
 
 #: nova/virt/disk/mount.py:76
 msgid "no partitions found"
-msgstr ""
+msgstr "разделы не найдена"
 
 #: nova/virt/disk/mount.py:77
 #, python-format
@@ -5208,182 +5247,187 @@ msgstr ""
 
 #: nova/virt/disk/nbd.py:63
 msgid "No free nbd devices"
-msgstr ""
+msgstr "Нет свободных устройств nbd"
 
 #: nova/virt/disk/nbd.py:81
 #, python-format
 msgid "qemu-nbd error: %s"
-msgstr ""
+msgstr "ошибка qemu-nbd: %s"
 
 #: nova/virt/disk/nbd.py:93
 #, python-format
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
-msgstr ""
+msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
-msgstr ""
+msgstr "Неполадка с подключением к libvirt"
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
+#, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
-msgstr ""
+msgstr "снимок %s: создание завершено"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
+#, fuzzy
 msgid "Failed to soft reboot instance."
-msgstr ""
+msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
+"Найдены %(migration_count)d неподтверждённых перемещений, старше "
+"%(confirm_window)d секунд"
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
-msgstr ""
+msgstr "Автоматические подтверждение перемещения %d"
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
-msgstr ""
+#: nova/virt/libvirt/connection.py:967
+#, fuzzy
+msgid "Guest does not have a console available"
+msgstr "Пользователь не имеет административных привилегий"
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
-msgstr ""
+msgstr "Создание изображения"
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
-msgstr ""
+msgstr "block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
+"Ошибка libvirt во время поиска %(instance_name)s: [Код ошибки "
+"%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
-msgstr ""
+msgstr "устаревшая версия libvirt (не поддерживается getVersion)"
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
-msgstr ""
+msgstr "'<cpu>' должно быть 1, но %d\n"
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
+"в xml...\n"
+":%s "
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5393,35 +5437,41 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
+#, fuzzy, python-format
 msgid "Instance running successfully."
-msgstr ""
+msgstr "Копия %s: выполнение"
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5431,6 +5481,8 @@ msgid ""
 "Libvirt module could not be loaded. NWFilterFirewall will not work "
 "correctly."
 msgstr ""
+"Модуль Libvirt не может быть загружен. NWFilterFirewall не будет работать"
+" надлежащим образом."
 
 #: nova/virt/libvirt/firewall.py:93
 msgid "Called setup_basic_filtering in nwfilter"
@@ -5440,182 +5492,185 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
-msgstr ""
+msgstr "nwfilter(%(instance_filter_name)s) для%(name)s не найден."
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
-msgstr ""
+msgstr "Брандмауэр iptables: Настройка базовой фильтрации"
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
-msgstr ""
+msgstr "Невозможно найти открытый порт"
 
 #: nova/virt/libvirt/vif.py:85
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
-msgstr ""
+msgstr "Ошибка отсоединения vif копии '%s'"
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
-msgstr ""
+msgstr "iSCSI-устройство не найдено в %s"
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
+"Том ISCSI не найден в: %(mount_device)s. Будет выполнена повторная "
+"проверка и попытка.  Повторение: %(tries)s"
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
-msgstr ""
+msgstr "Найден узел iSCSI %(mount_device)s (после %(tries)s повторных проверок)"
 
 #: nova/virt/vmwareapi/error_util.py:93
 #, python-format
@@ -5625,16 +5680,16 @@ msgstr ""
 #: nova/virt/vmwareapi/fake.py:44 nova/virt/xenapi/fake.py:77
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
-msgstr ""
+msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(objName)s"
-msgstr ""
+msgstr "Свойство %(attr)s не назначено для управляемого объекта %(objName)s"
 
 #: nova/virt/vmwareapi/fake.py:437
 msgid "There is no VM registered"
-msgstr ""
+msgstr "Отсутствуют зарегистрированные ВМ"
 
 #: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
 #, python-format
@@ -5644,19 +5699,19 @@ msgstr ""
 #: nova/virt/vmwareapi/fake.py:502
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
-msgstr ""
+msgstr "Завершение сеанса с неполадками или уже завершённого сеанса: %s"
 
 #: nova/virt/vmwareapi/fake.py:517
 msgid "Session is faulty"
-msgstr ""
+msgstr "Сеанс имеет неполадки"
 
 #: nova/virt/vmwareapi/fake.py:520
 msgid "Session Invalid"
-msgstr ""
+msgstr "Недопустимый сеанс"
 
 #: nova/virt/vmwareapi/fake.py:606
 msgid " No Virtual Machine has been registered yet"
-msgstr ""
+msgstr " Отсутствуют зарегистриованные виртуальные машины"
 
 #: nova/virt/vmwareapi/io_util.py:99
 #, python-format
@@ -5691,11 +5746,11 @@ msgstr ""
 
 #: nova/virt/vmwareapi/vim.py:84
 msgid "Unable to import suds."
-msgstr ""
+msgstr "Невозможно импортировать suds."
 
 #: nova/virt/vmwareapi/vim.py:90
 msgid "Must specify vmwareapi_wsdl_loc"
-msgstr ""
+msgstr "Необходимо задать vmwareapi_wsdl_loc"
 
 #: nova/virt/vmwareapi/vim.py:145
 #, python-format
@@ -5720,274 +5775,274 @@ msgstr ""
 #: nova/virt/vmwareapi/vim.py:166
 #, python-format
 msgid "Exception in %s "
-msgstr ""
+msgstr "Исключение в %s "
 
 #: nova/virt/vmwareapi/vmops.py:66
 msgid "Getting list of instances"
-msgstr ""
+msgstr "Перечень копий"
 
 #: nova/virt/vmwareapi/vmops.py:82
 #, python-format
 msgid "Got total of %s instances"
-msgstr ""
+msgstr "Всего %s копий"
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
-msgstr ""
+msgstr "Создание ВМ с именем %s на узле ESX"
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
-msgstr ""
+msgstr "Создание ВМ с именем %s на узле ESX"
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
-msgstr ""
+msgstr "Включение питания на копии ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
-msgstr ""
+msgstr "Питание включено на копии ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
-msgstr ""
+msgstr "Создание снимка копии ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
-msgstr ""
+msgstr "Создание снимка копии ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
-msgstr ""
+msgstr "Выгрузка образа %s"
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
-msgstr ""
+msgstr "Выгруженный образ %s"
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
-msgstr ""
+msgstr "Удаление временного файла vmdk %s"
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
-msgstr ""
+msgstr "Удалённый временный файл vmdk %s"
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
-msgstr ""
+msgstr "копия не включена"
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
-msgstr ""
+msgstr "Перезагрузка гостевой ОС ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
-msgstr ""
+msgstr "Выполнена перезагрузка гостевой ОС ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
-msgstr ""
+msgstr "Выполнение безотказной перезагрузки ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
-msgstr ""
+msgstr "копия - %s не представлена"
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
-msgstr ""
+msgstr "Выключение питания ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
-msgstr ""
+msgstr "Питание ВМ %s выключено"
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
-msgstr ""
+msgstr "Исключение регистрации ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
-msgstr ""
+msgstr "Незарегистрированная ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
-msgstr ""
+msgstr "Приостановка ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
-msgstr ""
+msgstr "Приостановленная ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
-msgstr ""
+msgstr "Питание копии выключено и следовательно она не может быть приостановлена."
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
-msgstr ""
+msgstr "Возобновление работы ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
-msgstr ""
+msgstr "Работа ВМ %s возобновлена "
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
-msgstr ""
+msgstr "копия не в приостановленном состоянии"
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
-msgstr ""
+msgstr "Создание папки с адресом %s"
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
-msgstr ""
+msgstr "Создана папка с адресом %s"
 
 #: nova/virt/vmwareapi/vmware_images.py:89
 #, python-format
@@ -6012,39 +6067,41 @@ msgstr ""
 #: nova/virt/vmwareapi/vmware_images.py:139
 #, python-format
 msgid "Getting image size for the image %s"
-msgstr ""
+msgstr "Получение размера образа для образа %s"
 
 #: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
-msgstr ""
+msgstr "Принят размер образа %(size)s для образа %(image)s"
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
-msgstr ""
+msgstr "xenapi.fake не имеет реализации для %s"
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
-msgstr ""
+msgstr "Выполняется вызов %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
-msgstr ""
+msgstr "Выполняется вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
 msgstr ""
+"xenapi.fake не имеет реализации для %s или был вызван с использованием "
+"неправильным числом аргументов"
 
 #: nova/virt/xenapi/host.py:67
 #, python-format
@@ -6053,34 +6110,35 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
-msgstr ""
+msgstr "Невозможно принять SR для этого узла: %s"
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
+#, fuzzy, python-format
 msgid "Unable to get updated status"
-msgstr ""
+msgstr "Невозможно получить обновлённое состояние: %s"
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
-msgstr ""
+msgstr "Вызов %(method)s возвратил ошибку: %(e)s."
 
 #: nova/virt/xenapi/network_utils.py:37
 #, python-format
 msgid "Found non-unique network for name_label %s"
-msgstr ""
+msgstr "Найдена не уникальная сеть для name_label %s"
 
 #: nova/virt/xenapi/network_utils.py:55
 #, python-format
 msgid "Found non-unique network for bridge %s"
-msgstr ""
+msgstr "Найдена не уникальная сеть для моста %s"
 
 #: nova/virt/xenapi/network_utils.py:58
 #, python-format
 msgid "Found no network for bridge %s"
-msgstr ""
+msgstr "Не найдена сеть для моста %s"
 
 #: nova/virt/xenapi/pool.py:111
 #, python-format
@@ -6092,27 +6150,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
-#, python-format
+#: nova/virt/xenapi/pool.py:146
+#, fuzzy, python-format
 msgid "Unable to join %(host)s in the pool"
-msgstr ""
+msgstr "Невозможно найти узел для копии %s"
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
-#, python-format
+#: nova/virt/xenapi/pool.py:174
+#, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
-msgstr ""
+msgstr "Невозможно использовать глобальные полномочия %(role_id)s"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6129,450 +6187,455 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
-msgstr ""
+msgstr "Созданная ВМ %s..."
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
-msgstr ""
+msgstr "Созданная ВМ %(instance_name)s как %(vm_ref)s."
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
+msgid "VBD not found in instance %s"
+msgstr "VBD не найдено для копии %s"
 
-#: nova/virt/xenapi/vm_utils.py:251
-#, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
-msgstr ""
+#: nova/virt/xenapi/vm_utils.py:265
+#, fuzzy, python-format
+msgid "VBD %s already detached"
+msgstr "группа %s уже существует"
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
+msgstr "Невозможно отсоединить VBD %s"
+
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
-msgstr ""
+msgstr "Невозможно ликвидировать VBD %s"
+
+#: nova/virt/xenapi/vm_utils.py:308
+#, fuzzy, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
-msgstr ""
+msgstr "Невозможно ликвидировать VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
+"Создан VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
+"на %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
-msgstr ""
+msgstr "Отсутствует первичный VDI для%(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
-msgstr ""
+msgstr "Снимок ВМ %(vm_ref)s с меткой '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
-msgstr ""
+msgstr "Создан снимок %(template_vm_ref)s из ВМ %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
-msgstr ""
+msgstr "Запрос xapi для выгрузки %(vdi_uuids)s в качестве ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
 #, python-format
-msgid "Asking xapi to fetch vhd image %(image)s"
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:760
+#, python-format
+msgid "Asking xapi to fetch vhd image %(image)s"
+msgstr "Запрос xapi на приём образа vhd %(image)s"
+
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
+"xapi 'download_vhd' возвратил VDI типа '%(vdi_type)s' с UUID "
+"'%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
-msgstr ""
+msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
-msgstr ""
+msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
+"Размер образа %(size_bytes)d превышает допустимый instance_type  размер "
+"%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
-msgstr ""
+msgstr "Получение образа %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
-msgstr ""
+msgstr "Тип образа: %s"
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
-msgstr ""
+msgstr "ISO: Найден sr, возможно содержащий образ ISO"
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
+"Превышен размер ядра/Ramdisk образа: %(vdi_size)d байт, макс. "
+"%(max_size)d байт"
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
-msgstr ""
+msgstr "Копирование VDI %s в /boot/guest на dom0"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
-msgstr ""
+msgstr "Ядро/Ramdisk VDI %s ликвидирован"
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
-msgstr ""
+msgstr "Обнаружен %(image_type_str)s формат для образа %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
-msgstr ""
+msgstr "Поиск vdi %s для ядра PV"
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
-msgstr ""
+msgstr "Неизвестный формат образа %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
-msgstr ""
+msgstr "VDI %s до сих пор доступен"
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
-msgstr ""
+msgstr "Повторная проверка SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
-msgstr ""
+msgstr "Невозможно найти SR типа содержимого ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
-msgstr ""
+msgstr "ISO: поиск SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
-msgstr ""
+msgstr "ISO: не содержимое iso типа"
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
-msgstr ""
+msgstr "ISO: SR с локальной PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
-msgstr ""
+msgstr "Время ожидания при создании устройства %s"
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
-msgstr ""
+msgstr "Подсоединение VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
-msgstr ""
+msgstr "Подсоединение VBD %s выполнено."
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
-msgstr ""
+msgstr "VBD %(vbd_ref)s подсоединено как %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
+"VBD %(vbd_ref)s подсоединено в неправильный dev, изменение назначения на "
+"%(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
-msgstr ""
+msgstr "Ликвидирование VBD для VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
+msgstr "Ликвидирование VBD для VDI %s завершено."
 
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
-msgstr ""
+msgstr "Найдено ядро Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
-msgstr ""
+msgstr "Ядро Xen не найдено.  Загрузка HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
-msgstr ""
+msgstr "Разделы:"
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
-msgstr ""
+msgstr "  %(num)s: %(ptype)s %(size)d секторов"
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
+"Запись таблицы разделов %(primary_first)d %(primary_last)d в "
+"%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
-msgstr ""
+msgstr "Запись таблицы разделов %s выполнена."
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
-msgstr ""
+msgstr "Средства XenServer не установлены в этот образ"
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
+"Ошибка присоединения файловой системы (ожидаемо для копий не на базе "
+"linux): %s"
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
-msgstr ""
+msgstr "Обновление выполнения копии '%(instance_uuid)s' до %(progress)d"
 
 #: nova/virt/xenapi/vmops.py:230
 #, python-format
 msgid "Attempted to power on non-existent instance bad instance id %s"
 msgstr ""
+"Предпринята попытка включения несуществующей копии, копии с неполадками с"
+" идентификатором %s"
 
 #: nova/virt/xenapi/vmops.py:232
 #, python-format
 msgid "Starting instance %s"
-msgstr ""
+msgstr "Запуск копии %s"
 
 #: nova/virt/xenapi/vmops.py:273
 #, python-format
@@ -6582,614 +6645,613 @@ msgstr ""
 #: nova/virt/xenapi/vmops.py:278
 #, python-format
 msgid "Skipping VDI destroy for %s"
-msgstr ""
+msgstr "Пропуск ликвидации VDI для %s"
 
 #: nova/virt/xenapi/vmops.py:302
 msgid "Removing kernel/ramdisk files from dom0"
-msgstr ""
+msgstr "Удаление ядра/ramdisk файлов из dom0"
 
 #: nova/virt/xenapi/vmops.py:357
-#, python-format
+#, fuzzy, python-format
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
-msgstr ""
+msgstr "Копия %(instance_id)s не выполняется."
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
+"Автоматическая настройка диска для копии %(instance_uuid)s, выполняется "
+"попытка изменения размера раздела..."
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
-msgstr ""
+msgstr "Недопустимое значение для injected_files: '%s'"
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
-msgstr ""
+msgstr "Настройка пароля администратора"
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
-msgstr ""
+msgstr "Восстановление сети"
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
-msgstr ""
+msgstr "Запуск ВМ %s..."
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
-msgstr ""
+msgstr "Копия %s: ожидание запуска"
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
-msgstr ""
+msgstr "Копия %s: выполнение"
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
-msgstr ""
+msgstr "Запрос версии агента"
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
-msgstr ""
+msgstr "Версия агента копии: %s"
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
-msgstr ""
+msgstr "Обновление агента до %s"
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
-msgstr ""
+msgstr "opaque_ref не может быть определён для '%s'."
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
-msgstr ""
+msgstr "Готовый снимок и выгрузка для ВМ %s"
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
-msgstr ""
+msgstr "Запуск снимка для ВМ %s"
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
-msgstr ""
+msgstr "Ошибка перемещения vhd на новый узел"
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr ""
+msgstr "Изменение размера VDI %(cow_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr ""
+msgstr "Изменение размера VDI %(vdi_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
-msgstr ""
+msgstr "Изменение размера копии %s завершено"
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
-msgstr ""
+msgstr "Ошибка запроса версии агента: %(resp)r"
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
-msgstr ""
+msgstr "Ошибка обновления агента: %(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
-msgstr ""
+msgstr "Ошибка обмена ключей: %(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
-msgstr ""
+msgstr "Ошибка обновления пароля: %(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
-msgstr ""
+msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
-msgstr ""
+msgstr "Невозможно найти VBD для ВМ"
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
-msgstr ""
+msgstr "Ликвидирование VDI для копии %(instance_uuid)s"
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
+"Копия %(instance_uuid)s использует RAW или VHD, пропуск ядра и удаление "
+"ramdisk"
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
-msgstr ""
+msgstr "копия содержит ядро или ramdisk, но не оба"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
-msgstr ""
+msgstr "файлы ядра/ramdisk удалены"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
-msgstr ""
+msgstr "Копия %(instance_uuid)s ВМ ликвидирована"
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
-msgstr ""
+msgstr "Ликвидирование ВМ для копии %(instance_uuid)s"
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
-msgstr ""
+msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
-msgstr ""
+msgstr "Копия в состоянии режима восстановления: %s"
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
-msgstr ""
+msgstr "Автоматическая безотказная перезагрузка %d"
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
-msgstr ""
+msgstr "Невозможно получить сведения о пропускной способности."
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
-msgstr ""
+msgstr "создание vif(s) для вм: |%s|"
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
-msgstr ""
+msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
-msgstr ""
+msgstr "Создан VIF %(vif_ref)s для ВМ %(vm_ref)s, сеть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
+"Вызов агентом %(method)s возвратил недопустимый ответ: %(ret)r. VM "
+"id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
+"ВРЕМЯ ПРОСТОЯ: Срок вызова %(method)s истёк. VM id=%(instance_uuid)s; "
+"args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
+"НЕ РЕАЛИЗОВАНО: Вызов %(method)s не поддерживается агентом. VM "
+"id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
+"Вызов %(method)s возвратил ошибку: %(e)s. VM id=%(instance_uuid)s; "
+"args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
-msgstr ""
+msgstr "Ошибка OpenSSL: %s"
 
 #: nova/virt/xenapi/volume_utils.py:52
 msgid "creating sr within volume_utils"
-msgstr ""
+msgstr "создание sr в volume_utils"
 
 #: nova/virt/xenapi/volume_utils.py:55 nova/virt/xenapi/volume_utils.py:83
 #, python-format
 msgid "type is = %s"
-msgstr ""
+msgstr "тип = %s"
 
 #: nova/virt/xenapi/volume_utils.py:58 nova/virt/xenapi/volume_utils.py:86
 #, python-format
 msgid "name = %s"
-msgstr ""
+msgstr "наименование = %s"
 
 #: nova/virt/xenapi/volume_utils.py:71
 #, python-format
 msgid "Created %(label)s as %(sr_ref)s."
-msgstr ""
+msgstr "Создано %(label)s как %(sr_ref)s."
 
 #: nova/virt/xenapi/volume_utils.py:76 nova/virt/xenapi/volume_utils.py:174
 msgid "Unable to create Storage Repository"
-msgstr ""
+msgstr "Невозможно создать репозиторий хранилища"
 
 #: nova/virt/xenapi/volume_utils.py:80
 msgid "introducing sr within volume_utils"
-msgstr ""
+msgstr "внедрение sr в volume_utils"
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
-msgstr ""
+msgstr "внедрён %(label)s в качестве %(sr_ref)s."
 
 #: nova/virt/xenapi/volume_utils.py:106
 msgid "Creating pbd for SR"
-msgstr ""
+msgstr "Создание pbd для SR"
 
 #: nova/virt/xenapi/volume_utils.py:108
 msgid "Plugging SR"
-msgstr ""
+msgstr "Подключение SR"
 
 #: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
 msgid "Unable to introduce Storage Repository"
-msgstr ""
+msgstr "Невозможно внедрить Репозиторий хранения"
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
-msgstr ""
+msgstr "Невозможно получить SR с использованием uuid"
 
 #: nova/virt/xenapi/volume_utils.py:129
 #, python-format
 msgid "Forgetting SR %s..."
-msgstr ""
+msgstr "Забывание SR %s..."
 
 #: nova/virt/xenapi/volume_utils.py:137
 msgid "Unable to forget Storage Repository"
-msgstr ""
+msgstr "Невозможно забыть Репозиторий хранения"
 
 #: nova/virt/xenapi/volume_utils.py:157
 #, python-format
 msgid "Introducing %s..."
-msgstr ""
+msgstr "Внедрение %s..."
 
 #: nova/virt/xenapi/volume_utils.py:186
 #, python-format
 msgid "Unable to find SR from VBD %s"
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
+msgstr "Невозможно найти SR из VBD %s"
 
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
-msgstr ""
+msgstr "Пропуск исключения %(exc)s при получении PBD для %(sr_ref)s"
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
-msgstr ""
+msgstr "Пропуск исключения %(exc)s при отсоединении PBD %(pbd)s"
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
-msgstr ""
+msgstr "Невозможно внедрить VDI на SR %s"
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
-msgstr ""
+msgstr "Невозможно получить запись VDI %s на"
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
-msgstr ""
+msgstr "Невозможно внедрить VDI для SR %s"
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
-msgstr ""
+msgstr "Ошибка поиска vdis в SR %s"
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
-msgstr ""
+msgstr "Ошибка поиска vbd для vdi %s"
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
-msgstr ""
+msgstr "Невозможно получить сведения назначения %(data)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
-msgstr ""
+msgstr "Точка подключения не может быть переведена: %s"
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
-msgstr ""
+msgstr "Создание SR %s"
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
-msgstr ""
+msgstr "Невозможно создать SR"
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
-msgstr ""
+msgstr "Невозможно получить запись SR"
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
-msgstr ""
+msgstr "Внедрение SR %s"
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
-msgstr ""
+msgstr "SR найдено в базе данных xapi. Нет необходимости во внедрении"
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
-msgstr ""
+msgstr "Невозможно внедрить SR"
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
-msgstr ""
+msgstr "Проверка SR %s"
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
-msgstr ""
+msgstr "SR %s не найден в базе данных xapi"
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
-msgstr ""
+msgstr "Невозможно забыть SR"
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
-msgstr ""
+msgstr "Невозможно создать VDI на SR %(sr_ref)s для копии %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
-msgstr ""
+msgstr "Невозможно использовать SR %(sr_ref)s для копии %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
-msgstr ""
+msgstr "Невозможно присоединить том для копии %s"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
-msgstr ""
+msgstr "Точка подключения %(mountpoint)s присоединена к копии %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
-msgstr ""
+msgstr "Невозможно найти том %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
-msgstr ""
+msgstr "Невозможно отсоединить том %s"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
-msgstr ""
+msgstr "Невозможно ликвидировать vbd %s"
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
-msgstr ""
+msgstr "Ошибка очистки SR %s"
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
-msgstr ""
+msgstr "Точка подключения %(mountpoint)s отсоединена от копии %(instance_name)s"
 
 #: nova/vnc/xvp_proxy.py:98 nova/vnc/xvp_proxy.py:103
 #, python-format
 msgid "Error in handshake: %s"
-msgstr ""
+msgstr "Ошибка в соглашении: %s"
 
 #: nova/vnc/xvp_proxy.py:119
 #, python-format
 msgid "Invalid request: %s"
-msgstr ""
+msgstr "Недопустимый запрос: %s"
 
 #: nova/vnc/xvp_proxy.py:139
 #, python-format
 msgid "Request: %s"
-msgstr ""
+msgstr "Запрос: %s"
 
 #: nova/vnc/xvp_proxy.py:142
 #, python-format
 msgid "Request made with missing token: %s"
-msgstr ""
+msgstr "Запрос сделан с отсутствующим токеном: %s"
 
 #: nova/vnc/xvp_proxy.py:153
 #, python-format
 msgid "Request made with invalid token: %s"
-msgstr ""
+msgstr "Запрос сделан с недопустимым токеном: %s"
 
 #: nova/vnc/xvp_proxy.py:160
 #, python-format
 msgid "Unexpected error: %s"
-msgstr ""
+msgstr "Непредвиденная ошибка: %s"
 
 #: nova/vnc/xvp_proxy.py:180
 #, python-format
 msgid "Starting nova-xvpvncproxy node (version %s)"
-msgstr ""
+msgstr "Запуск узла сети nova-xvpvncproxy (версия %s)"
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
 #: nova/volume/api.py:85
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
-msgstr ""
+msgstr "Превышена квота для %(pid)s, попытка создания тома %(size)sG"
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
-msgstr ""
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
+msgstr "Состояние тома должно быть доступно"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
-msgstr ""
+msgstr "Восстановление после недопустимого выполнения.  Попытка номер %s"
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
-msgstr ""
+msgstr "том группы %s не существует"
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
-msgstr ""
+msgstr "Невозможно найти экспортирование iSCSI для тома %s"
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7198,6 +7260,8 @@ msgstr ""
 #, python-format
 msgid "Cannot confirm exported volume id:%(volume_id)s."
 msgstr ""
+"Невозможно подтвердить идентификатора экспортированного "
+"тома:%(volume_id)s."
 
 #: nova/volume/driver.py:486
 #, python-format
@@ -7207,195 +7271,127 @@ msgstr ""
 #: nova/volume/driver.py:498
 #, python-format
 msgid "rbd has no pool %s"
-msgstr ""
+msgstr "rbd не имеет пула %s"
 
 #: nova/volume/driver.py:568
 #, python-format
 msgid "Sheepdog is not working: %s"
-msgstr ""
+msgstr "Sheepdog не выполняется: %s"
 
 #: nova/volume/driver.py:570
 msgid "Sheepdog is not working"
-msgstr ""
+msgstr "Sheepdog не выполняется"
 
 #: nova/volume/driver.py:669 nova/volume/driver.py:674
 #, python-format
 msgid "LoggingVolumeDriver: %s"
-msgstr ""
-
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
+msgstr "LoggingVolumeDriver: %s"
 
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
-msgstr ""
+msgstr "Повторное экспортирование %s томов"
 
 #: nova/volume/manager.py:101
 #, python-format
 msgid "volume %s: skipping export"
-msgstr ""
+msgstr "том %s: пропуск экспортирования"
 
 #: nova/volume/manager.py:107
 #, python-format
 msgid "volume %s: creating"
-msgstr ""
+msgstr "том %s: создание"
 
 #: nova/volume/manager.py:119
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
-msgstr ""
+msgstr "том %(vol_name)s: создание lv объёмом %(vol_size)sG"
 
 #: nova/volume/manager.py:131
 #, python-format
 msgid "volume %s: creating export"
-msgstr ""
+msgstr "том %s: создание экспортирования"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
-msgstr ""
+msgstr "том %s: создание завершено"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
-msgstr ""
+msgstr "Том до сих пор присоединён"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
-msgstr ""
+msgstr "том %s: удаление экспортирования"
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
-msgstr ""
+msgstr "том %s: удаление"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
-msgstr ""
+msgstr "том %s: том занят"
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
-msgstr ""
+msgstr "том %s: удаление завершено"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
-msgstr ""
+msgstr "снимок %s: создание"
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
-msgstr ""
+msgstr "снимок %(snap_name)s: создание"
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
-msgstr ""
+msgstr "снимок %s: создание завершено"
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
-msgstr ""
+msgstr "снимок %s: удаление"
 
-#: nova/volume/manager.py:235
-#, python-format
+#: nova/volume/manager.py:214
+#, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
-msgstr ""
+msgstr "снимок %s: создание завершено"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
-msgstr ""
+msgstr "снимок %s: удаление выполнено"
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
-msgstr ""
+msgstr "Проверка возможностей тома"
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
-msgstr ""
+msgstr "Обнаружены новые возможности: %s"
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
-msgstr ""
+msgstr "Очистить возможности"
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
-msgstr ""
+msgstr "Принято уведомление {%s}"
 
 #: nova/volume/netapp.py:79
 #, python-format
@@ -7418,17 +7414,18 @@ msgid "Job failed: %s"
 msgstr ""
 
 #: nova/volume/netapp.py:240
+#, fuzzy
 msgid "Failed to provision dataset member"
-msgstr ""
+msgstr "Ошибка обновления базы данных"
 
 #: nova/volume/netapp.py:252
 msgid "No LUN was created by the provision job"
 msgstr ""
 
 #: nova/volume/netapp.py:261 nova/volume/netapp.py:433
-#, python-format
+#, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
-msgstr ""
+msgstr "Ошибка поиска vbd для vdi %s"
 
 #: nova/volume/netapp.py:280
 msgid "Failed to remove and delete dataset member"
@@ -7437,7 +7434,7 @@ msgstr ""
 #: nova/volume/netapp.py:603 nova/volume/netapp.py:657
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
-msgstr "Нет vpn данных для проекта %s"
+msgstr "Невозможно найти экспортирование iSCSI для тома %s"
 
 #: nova/volume/netapp.py:607 nova/volume/netapp.py:661
 #, fuzzy, python-format
@@ -7459,102 +7456,110 @@ msgstr "Ошибка получения метаданных для ip: %s"
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Ошибка получения метаданных для ip: %s"
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
-msgstr ""
+msgstr "Задайте san_password или san_private_key"
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
-msgstr ""
+msgstr "san_ip должен быть назначен"
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
-msgstr ""
+msgstr "LUID не найден для %(zfs_poolname)s. Вывод=%(out)s"
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
-msgstr ""
+msgstr "Возврат команды CLIQ %s"
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
+"Неправильный ответ на команду CLIQ %(verb)s %(cliq_args)s. "
+"Результат=%(out)s"
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
-msgstr ""
+msgstr "Ошибка выполнения команды CLIQ %(verb)s %(cliq_args)s.  Результат=%(out)s"
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
+"Непредвиденное количество виртуальных ip для кластера  %(cluster_name)s. "
+"Результат=%(_xml)s"
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
-msgstr ""
+msgstr "Сведения о томе: %(volume_name)s => %(volume_attributes)s"
+
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr "local_path не поддерживается"
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
-msgstr ""
+msgstr "Невозможно определить проект для тома %s, невозможно экспортировать"
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7579,11 +7584,11 @@ msgstr ""
 #: nova/volume/xensm.py:60
 #, python-format
 msgid "Failed to create sr %s...continuing"
-msgstr ""
+msgstr "Ошибка создания sr %s...продолжение"
 
 #: nova/volume/xensm.py:62
 msgid "Create failed"
-msgstr ""
+msgstr "Ошибка создания"
 
 #: nova/volume/xensm.py:64
 #, python-format
@@ -7592,12 +7597,12 @@ msgstr ""
 
 #: nova/volume/xensm.py:71
 msgid "Failed to update db"
-msgstr ""
+msgstr "Ошибка обновления базы данных"
 
 #: nova/volume/xensm.py:80
 #, python-format
 msgid "Failed to introduce sr %s...continuing"
-msgstr ""
+msgstr "Ошибка внедрения sr %s...продолжение"
 
 #: nova/volume/xensm.py:91
 #, python-format
@@ -7606,49 +7611,50 @@ msgstr ""
 
 #: nova/volume/xensm.py:100
 msgid "XenSMDriver requires xenapi connection"
-msgstr ""
+msgstr "XenSMDriver необходимо xenapi соединение"
 
 #: nova/volume/xensm.py:110
 msgid "Failed to initiate session"
-msgstr ""
+msgstr "Ошибка начала сеанса"
 
 #: nova/volume/xensm.py:142
 #, python-format
 msgid "Volume will be created in backend - %d"
-msgstr ""
+msgstr "Том будет создан во внутреннем интерфейсе - %d"
 
 #: nova/volume/xensm.py:154
 msgid "Failed to update volume in db"
-msgstr ""
+msgstr "Ошибка обновления тома в базе данных"
 
 #: nova/volume/xensm.py:157
 msgid "Unable to create volume"
-msgstr ""
+msgstr "Невозможно создать том"
 
 #: nova/volume/xensm.py:171
 msgid "Failed to delete vdi"
-msgstr ""
+msgstr "Ошибка удаления vdi"
 
 #: nova/volume/xensm.py:177
 msgid "Failed to delete volume in db"
-msgstr ""
+msgstr "Ошибка удаления тома в базе данных"
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
-msgstr ""
+msgstr "Ошибка поиска тома в базе данных"
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
-msgstr ""
+msgstr "Ошибка поиска внутреннего интерфейса в базе данных"
 
 #: nova/volume/nexenta/__init__.py:27
+#, fuzzy, python-format
 msgid "Nexenta SA returned the error"
-msgstr ""
+msgstr "Сервер возвратил ошибку: %s"
 
 #: nova/volume/nexenta/jsonrpc.py:64
-#, python-format
+#, fuzzy, python-format
 msgid "Sending JSON data: %s"
-msgstr ""
+msgstr "Заданные данные: %s"
 
 #: nova/volume/nexenta/jsonrpc.py:69
 #, python-format
@@ -7669,9 +7675,9 @@ msgid "Got response: %s"
 msgstr "ответ %s"
 
 #: nova/volume/nexenta/volume.py:96
-#, python-format
+#, fuzzy, python-format
 msgid "Volume %s does not exist in Nexenta SA"
-msgstr ""
+msgstr "том группы %s не существует"
 
 #: nova/volume/nexenta/volume.py:180
 msgid ""
@@ -7718,160 +7724,112 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
-
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
-
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr "Параметры доступы Nova не заданы."
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr "Виртуальный массив для хранения данных %(id)d не найден."
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
-
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr "Виртуальный массив для хранения данных %(name)s не найден."
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr "Тело не предоставлено"
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr "Создать VSA %(display_name)s типа %(vc_type)s"
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr "Удалить VSA с идентификатором: %s"
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr "Ассоциировать адрес %(ip)s с VSA %(id)s"
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr "Исключить адрес для VSA %(id)s"
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr "%(obj)s с идентификатором %(id)s не найден"
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
+#~ "%(obj)s с идентификатором %(id)s относится "
+#~ "к VSA %(own_vsa_id)s и не VSA "
+#~ "%(vsa_id)s."
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr "Index. vsa_id=%(vsa_id)s"
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr "Создать том %(size)s ГБ из VSA ID %(vsa_id)s"
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr "Обновить %(obj)s с идентификатором: %(id)s, изменения: %(changes)s"
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
-#~ msgstr ""
-
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
 #~ msgstr ""
 
-#~ msgid "No host for instance %s, deleting immediately"
-#~ msgstr ""
-
-#~ msgid "Going to try to terminate %s"
-#~ msgstr ""
+#~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr "Принудительное удаление вм %(instance_uuid)s, даже если она удалена"
 
-#~ msgid "Going to try to stop %s"
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
 #~ msgstr ""
+#~ "Копия %(instance_uuid)s не существует в "
+#~ "БД, но будет выполнено выключение "
+#~ "используя особый контекст"
 
-#~ msgid "Going to try to start %s"
-#~ msgstr ""
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "попытка ликвидации уже ликвидированной копии: %s"
 
 #~ msgid ""
 #~ "Instance %(name)s found in database but"
@@ -7885,20 +7843,169 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
-#~ msgid "Can't downgrade without losing data"
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
+#~ "Ошибка соединения с SQL (%(connstring)s). "
+#~ "%(attempts)d попыток осталось."
+
+#~ msgid "Can't downgrade without losing data"
+#~ msgstr "Невозможно перейти на предыдущую версию без потери данных"
+
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr "Копия %(instance_id)s не найдена"
 
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
-#~ msgid "Unable to get updated status: %s"
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr "_filter_hosts: %(request_spec)s"
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr "На узле %s недостаточно свободного места. Пропуск"
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr "Фильтр узлов: %s"
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr "Выбрано макс. количество узлов (%d)"
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr "Том обеспечения %(name)s размером %(size)s ГБ на узле %(host)s"
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr "%(i)d: Том %(name)s"
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr "Ошибка создания томов"
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr "Том не-VSA %d"
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr "Ошибка создания тома"
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr "Возможность для тома, объёмом %(size)s, не выбрана"
+
+#~ msgid "Host %s:"
+#~ msgstr "Узел %s:"
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+#~ "\tДиск %(qosgrp)-25s: всего %(total)2s, "
+#~ "занято %(used)2s, свободно %(free)2s. "
+#~ "Доступный объём %(avail)-5s"
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr "\t LeastUsedHost: Наилучший узел: %(best_host)s. (занято %(min_used)s)"
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+#~ "\t MostAvailCap: Наилучший узел: "
+#~ "%(best_host)s. (доступно %(max_avail)s %(type_str)s)"
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
 #~ msgstr ""
 
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr "Тест: user_data = %s"
+
+#~ msgid "_create: param=%s"
+#~ msgstr "_create: param=%s"
+
+#~ msgid "Host %s"
+#~ msgstr "Узел %s"
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr "Проверка: обеспечение vol %(name)s на узле %(host)s"
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr "\t vol=%(vol)s"
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr "Тест: запрос обновления VSA: vsa_id=%(vsa_id)s values=%(values)s"
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr "Тест: Создание тома: %s"
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr "Тест: Том получает запрос: id=%(volume_id)s"
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr "Тест: Запрос обновления тома: id=%(volume_id)s значения=%(values)s"
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr "Тест: Том получает: id=%(volume_id)s"
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr "Состояние задачи [%(name)s] %(task)s: готово    %(result)s"
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr "Состояние задачи [%(name)s] %(task)s: %(status)s    %(error_info)s"
+
 #~ msgid ""
 #~ "deactivate_node is called for                "
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr "Невозможно прочитать консоль LXC"
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7908,12 +8015,75 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "Создание особого CDROM VBD для ВМ %(vm_ref)s, VDI %(vdi_ref)s ... "
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+#~ "Создана VBD на основе CDROM  %(vbd_ref)s"
+#~ "  для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr "Создание VBD для VDI %s ... "
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr "Создание VBD для VDI %s выполнено."
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr "Пропуск XenAPI.Failure в VBD.unplug: %s"
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr "Пропуск XenAPI.Failure %s"
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7924,8 +8094,140 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid "Resources to remove:%s"
-#~ msgstr ""
+#~ msgstr "Ресурсы для удаления:%s"
 
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "Создание VBD для ВМ %(vm_ref)s, VDI %(vdi_ref)s ... "
+
+#~ msgid "Error destroying VDI"
+#~ msgstr "Ошибка ликвидации VDI"
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr "\tТом %s не является VSA томом"
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr "\tСоздание тома FE VSA %s - ничего не выполнять"
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr "Ошибка VSA BE create_volume для %s"
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr "VSA BE create_volume для %s выполнено"
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr "\tУдаление FE VSA тома %s - ничего не выполнять"
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr "Ошибка VSA BE delete_volume для %s"
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr "VSA BE delete_volume для %s выполнено"
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr "\tТом FE VSA %s создать экспортирование - ничего не выполнять"
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr "\tТом FE VSA %s удалить экспортирование - ничего не выполнять"
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr "Ошибка приёма сведений QoS"
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr "*** Экспериментальный код VSA ***"
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr "Запрошенное количество VC (%d) избыточно. Назначение по умолчанию"
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr "Создание VSA: %s"
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Создать "
+#~ "том %(vol_name)s, %(vol_size)d ГБ, тип "
+#~ "%(vol_type_id)s"
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr "VSA ID %(vsa_id)d: Обновить состояние VSA на %(status)s"
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr "VSA ID %(vsa_id)d: Обновить вызов VSA"
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr "Добавление %(add_cnt)s VC в VSA %(vsa_name)s."
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr "Удаление %(del_cnt)s VC из VSA %(vsa_name)s."
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr "VSA ID %(vsa_id)s: Удаление %(direction)s тома %(vol_name)s"
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr "Невозможно удалить том %s"
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+#~ "VSA ID %(vsa_id)s: Принудительное удаление."
+#~ " %(direction)s том %(vol_name)s"
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr "Выполнение завершения работы VSA ID %s"
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr "VSA ID %(vsa_id)s: Удалить копию %(name)s"
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr "Создать вызов полученный для VSA %s"
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr "Ошибка поиска VSA %(vsa_id)d"
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr "VSA ID %(vsa_id)s: Создан накопитель %(vol_id)s. Состояние %(status)s"
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr "Накопитель %(vol_name)s (%(vol_disp_name)s) в фазе создания - подождите"
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 7abf8288e..d5ae5095a 100644
--- a/nova/locale/tl/LC_MESSAGES/nova.po
+++ b/nova/locale/tl/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Tagalog <tl@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -121,198 +126,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "walang paraan para sa mensahe: %s"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -320,618 +334,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1057,6 +1062,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1089,193 +1099,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1315,6 +1329,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1348,97 +1367,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1452,170 +1471,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1684,36 +1763,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1782,12 +1871,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1843,7 +1932,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1860,20 +1949,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1883,8 +1972,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1961,179 +2050,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2172,7 +2264,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2205,8 +2297,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2224,46 +2316,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2296,8 +2388,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2317,8 +2409,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2360,11 +2452,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2461,11 +2553,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2483,27 +2570,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2517,82 +2599,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2616,7 +2622,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2633,133 +2639,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2785,117 +2791,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2947,453 +2958,455 @@ msgstr ""
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
+#: nova/compute/manager.py:699
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:708
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
 #, python-format
-msgid "terminating bdm %s"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3468,31 +3481,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3505,11 +3518,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3517,6 +3525,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3575,74 +3584,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3665,94 +3678,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3760,41 +3787,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3802,68 +3829,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3878,7 +3905,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3888,7 +3915,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3898,7 +3925,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3931,42 +3958,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3989,15 +4016,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4007,7 +4034,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4019,56 +4046,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "natanggap %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "Walang paraan para sa mensahe: %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4084,119 +4111,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "Muling kumonekta sa queue"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4206,30 +4241,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4254,182 +4265,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
-#, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
-msgstr ""
-
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4486,34 +4450,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4576,27 +4540,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4605,19 +4561,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4652,11 +4605,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4711,77 +4659,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4805,21 +4713,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4855,40 +4763,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5071,7 +4969,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5093,7 +4991,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5108,8 +5006,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5134,44 +5032,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5217,170 +5129,166 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5390,35 +5298,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5437,148 +5350,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5587,29 +5501,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5728,260 +5642,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6016,27 +5930,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6050,16 +5964,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6089,27 +6003,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6126,437 +6040,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6590,276 +6493,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6892,7 +6795,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6909,7 +6812,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6932,160 +6835,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7125,7 +7014,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7134,59 +7023,59 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+msgid "Volume status must be available or error"
 msgstr ""
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7220,74 +7109,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7313,83 +7134,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7456,102 +7277,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7630,11 +7455,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7715,144 +7540,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7871,6 +7655,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7882,12 +7685,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7896,6 +7835,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7905,12 +7853,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7926,3 +7935,133 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "Volume status must be available"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index 8eba7524f..89c47f3b3 100644
--- a/nova/locale/tr/LC_MESSAGES/nova.po
+++ b/nova/locale/tr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-12-14 18:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -121,198 +126,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr ""
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -320,618 +334,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1057,6 +1062,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1089,193 +1099,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1315,6 +1329,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1348,97 +1367,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1452,170 +1471,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1684,36 +1763,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1782,12 +1871,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1843,7 +1932,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1860,20 +1949,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1883,8 +1972,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1961,179 +2050,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2172,7 +2264,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2205,8 +2297,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2224,46 +2316,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2296,8 +2388,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2317,8 +2409,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2360,11 +2452,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2461,11 +2553,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2483,27 +2570,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2517,82 +2599,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2616,7 +2622,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2633,133 +2639,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2785,117 +2791,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2947,453 +2958,455 @@ msgstr ""
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
+#: nova/compute/manager.py:699
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:708
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
 #, python-format
-msgid "terminating bdm %s"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3468,31 +3481,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3505,11 +3518,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3517,6 +3525,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3575,74 +3584,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3665,94 +3678,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3760,41 +3787,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3802,68 +3829,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3878,7 +3905,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3888,7 +3915,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3898,7 +3925,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3931,42 +3958,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3989,15 +4016,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4007,7 +4034,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4019,56 +4046,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4084,119 +4111,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4206,30 +4241,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4254,182 +4265,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4486,34 +4450,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4576,27 +4540,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4605,19 +4561,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4652,11 +4605,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4711,77 +4659,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4805,21 +4713,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4855,40 +4763,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5071,7 +4969,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5093,7 +4991,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5108,8 +5006,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5134,44 +5032,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5217,170 +5129,166 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5390,35 +5298,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5437,148 +5350,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5587,29 +5501,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5728,260 +5642,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6016,27 +5930,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6050,16 +5964,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6089,27 +6003,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6126,437 +6040,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6590,276 +6493,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6892,7 +6795,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6909,7 +6812,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6932,160 +6835,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7125,7 +7014,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7134,59 +7023,59 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+msgid "Volume status must be available or error"
 msgstr ""
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7220,74 +7109,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7313,83 +7134,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7455,102 +7276,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7629,11 +7454,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7714,144 +7539,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7870,6 +7654,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7881,12 +7684,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7895,6 +7834,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7904,12 +7852,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7925,3 +7934,133 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "Volume status must be available"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 75848aa24..edc407ae1 100644
--- a/nova/locale/uk/LC_MESSAGES/nova.po
+++ b/nova/locale/uk/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -18,7 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -122,198 +127,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "без порядку для повідомлень: %s"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -321,618 +335,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1058,6 +1063,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1090,193 +1100,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1316,6 +1330,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1349,97 +1368,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1453,170 +1472,231 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, fuzzy, python-format
+msgid "%s - This rule already exists in group"
+msgstr "Це правило вже існує в групі %s"
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Створити розділ на %s ГБ"
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+#, fuzzy, python-format
+msgid "Detach Volume Failed."
+msgstr "Від'єднати том %s"
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr "лише група \"всі\" підтримується"
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1685,36 +1765,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1783,12 +1873,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1844,7 +1934,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1861,20 +1951,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1884,8 +1974,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1962,179 +2052,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2173,7 +2266,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2206,8 +2299,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2225,46 +2318,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2297,8 +2390,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2318,8 +2411,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2361,11 +2454,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2462,11 +2555,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2484,27 +2572,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2518,82 +2601,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2617,7 +2624,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2634,133 +2641,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2786,117 +2793,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2948,453 +2960,455 @@ msgstr ""
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
+#: nova/compute/manager.py:699
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:708
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
 #, python-format
-msgid "terminating bdm %s"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3469,31 +3483,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3506,11 +3520,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3518,6 +3527,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3576,74 +3586,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3666,94 +3680,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3761,41 +3789,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3803,68 +3831,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3879,7 +3907,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3889,7 +3917,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3899,7 +3927,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3932,42 +3960,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3990,15 +4018,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4008,7 +4036,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4020,56 +4048,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "отримано %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "Без порядку для повідомлень: %s"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4085,119 +4113,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "Оновлено з'єднання до черги"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "відповідь %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr "заголовок %s"
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "повідомлення %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4207,30 +4243,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4255,182 +4267,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
-#, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4487,34 +4452,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4577,27 +4542,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4606,19 +4563,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4653,11 +4607,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4712,77 +4661,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4806,21 +4715,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4856,40 +4765,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5072,7 +4971,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5094,7 +4993,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5109,8 +5008,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5135,44 +5034,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5218,170 +5131,166 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
+#: nova/virt/libvirt/connection.py:967
+msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5391,35 +5300,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5438,148 +5352,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5588,29 +5503,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5729,260 +5644,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6017,27 +5932,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6051,16 +5966,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6090,27 +6005,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6127,437 +6042,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6591,276 +6495,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6893,7 +6797,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6910,7 +6814,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6933,160 +6837,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7126,7 +7016,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7135,59 +7025,59 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+msgid "Volume status must be available or error"
 msgstr ""
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7221,74 +7111,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7314,83 +7136,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7457,102 +7279,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7631,11 +7457,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7716,144 +7542,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7872,6 +7657,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7883,12 +7687,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7897,6 +7837,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7906,12 +7855,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7927,3 +7937,133 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "Volume status must be available"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index cc59a7cb4..2cd1f4891 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
-"PO-Revision-Date: 2012-02-29 03:18+0000\n"
-"Last-Translator: Edward <Unknown>\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
+"PO-Revision-Date: 2012-03-16 07:11+0000\n"
+"Last-Translator: Vincent Hou <houshengbo@hotmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -126,198 +131,208 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "政策不允许 %(action)s 被执行。"
 
 #: nova/exception.py:216
+#, fuzzy, python-format
+msgid "Not authorized for image %(image_id)s."
+msgstr "没有为镜像 %(image_id)s 找到内核。"
+
+#: nova/exception.py:220
 msgid "Unacceptable parameters."
 msgstr "不能接受的参数。"
 
-#: nova/exception.py:221
+#: nova/exception.py:225
 msgid "Invalid snapshot"
 msgstr "无效的快照"
 
-#: nova/exception.py:225
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "卷 %(volume_id)s 没有与任何东西关联"
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
 msgstr "Keypair数据无效"
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr "把数据加载为json格式失败"
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr "请求无效。"
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr "针对用户 %(user)s 的无效签名 %(signature)s"
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr "收到无效的输入"
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr "无效的实例类型 %(instance_type)s。"
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr "无效的卷类型"
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr "无效的卷"
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "无效的端口范围 %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "无效的IP协议 %(protocol)s。"
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "无效的内容类型 %(content_type)s。"
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "无效的cidr %(cidr)s。"
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr "无效的RPC连接重用。"
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr "无法在aggregate %(aggregate_id)s 上执行啊action '%(action)s'。原因： %(reason)s。"
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr "实例 %(instance_uuid)s 处于%(attr)s %(state)s 中。该实例在这种状态下不能 %(method)s。"
 
-#: nova/exception.py:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "实例 %(instance_id)s 没有运行。"
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "实例 %(instance_id)s 没有挂起。"
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "实例 %(instance_id)s 不在rescue模式。"
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr "挂起实例失败"
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr "再启动服务器失败"
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+#, fuzzy
+msgid "Failed to terminate instance"
+msgstr "重新启动实例失败"
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr "该时刻服务无法使用。"
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr "该时刻卷服务无法使用。"
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr "该时刻计算服务无法使用。"
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "无法把实例 (%(instance_id)s) 迁移到当前主机 (%(host)s)。"
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr "该时刻目标计算主机无法使用。"
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr "该时刻原始计算主机无法使用。"
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr "提供的hypervisor类型无效。"
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "该实例需要比当前更新版本的hypervisor。"
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "提供的磁盘路径 (%(path)s) 已经存在，预计是不存在的。"
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr "无法接受的CPU信息"
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s 不是有效的IP v4/6地址。"
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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 "VLAN标签对于端口组%(bridge)s 是不适合的。预计的VLAN标签是 %(tag)s，但与端口组关联的是 %(pgroup)s。"
 
-#: nova/exception.py:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -327,398 +342,403 @@ msgstr ""
 "包含端口组 %(bridge)s 的vSwitch没有与预计的物理适配器关联。预计的vSwitch是 %(expected)s，但关联的是 "
 "%(actual)s。"
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "磁盘格式 %(disk_format)s 不能接受"
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "实例 %(instance_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s 无法接受。"
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr "资源没有找到。"
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr "要求的flag %(flag)s 没有设置。"
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, fuzzy, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "Unable to locate account %(account_name) on Solidfire device"
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "卷 %(volume_id)s 没有含键 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr "没有找到卷类型。"
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "卷类型 %(volume_type_id)s 没有找到。"
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "名为 %(volume_type_name)s 的卷类型没有找到。"
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr "卷类型 %(volume_type_id)s 没有额外说明键 %(extra_specs_key)s 。"
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "正在删除有快照的卷  %(volume_name)s"
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "没有为卷 %(volume_id)s 找到目标id。"
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "在 %(location)s 没有磁盘"
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "无法为 %(driver_type)s 卷找到handler。"
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "无效的镜像href %(image_href)s。"
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr "有些镜像通过hrefs存储。该api版本不支持显示镜像hrefs。"
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "没有为镜像 %(image_id)s 找到内核。"
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr "用户 %(user_id)s 没有找到。"
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr "用户 %(user_id)s 不是项目 %(project_id)s 的成员。"
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr "角色 %(role_id)s 没有找到。"
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr "没有找到SR来读写VDI。"
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "创建网络 %(req)s  是必要的。"
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "无法为桥 %(bridge)s 找到网络"
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "无法为uuid %(uuid)s 找到网络"
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "无法为cidr %(cidr)s 找到网络。"
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr "没有网络定义。"
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr "或者网络uuid %(network_uuid)s不存在，或者它没有分配给项目 %(project_id)s。"
 
-#: nova/exception.py:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "主机没有设置于网络 (%(network_id)s)。"
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, fuzzy, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr "网络 %s 存在活跃的端口，无法删除"
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "无法找到虚拟机使用的datastore reference(s)。"
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "没有固定IP与id %(id)s 关联。"
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "没有为地址 %(address)s 找到固定IP。"
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr "实例 %(instance_id)s 没有固定ip。"
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "网络主机 %(host)s 在网络 %(network_id)s 中没有固定ip。"
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr "实例 %(instance_id)s 没有固定ip '%(ip)s'。"
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr "主机 %(host)s 没有固定IP。"
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr "网络 (%(network_uuid)s) 中不存在固定IP地址 (%(address)s)。"
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr "固定IP地址 %(address)s 已在使用。"
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "固定IP地址 %(address)s 无效。"
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr "没有固定ip可用。"
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr "找不到固定IP。"
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "找不到适合id %(id)s 的浮动IP。"
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "DNS 入口 %(name)s 已经在域中 %(domain)s 存在。"
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "找不到适合地址 %(address)s 的浮动ip。"
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr "没有浮动IP可用。"
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "浮动ip %(address)s 没有被关联。"
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr "没有浮动ip存在。"
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "接口 %(interface)s没有找到。"
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "没有为用户 %(user_id)s 找到Keypair %(name)s。"
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "证书 %(certificate_id)s 没有找到。"
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "主机 %(host)s 没有找到。"
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "计算主机 %(host)s 没有找到。"
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "没有在主机 %(host)s 找到二进制 %(binary)s。"
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr "验证令牌 %(token)s 没有找到。"
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr "Access Key %(access_key)s 没有找到。"
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr "配额没有找到。"
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, fuzzy, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "安全组 %(security_group_id)s 没有找到。"
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr "没有为项目 %(project_id)s 找到 安全组 %(security_group_id)s。"
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr "安全组 %(security_group_id)s 已经与实例 %(instance_id)s 关联。"
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr "安全组 %(security_group_id)s 没有与实例 %(instance_id)s 关联。"
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "迁移 %(migration_id)s 没有找到。"
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "没有为状态是 %(status)s 的实例 %(instance_id)s 找到迁移。"
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Console pool %(pool_id)s 没有找到。"
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -727,222 +747,208 @@ msgstr ""
 "没有为计算主机 %(compute_host)s 在代理主机 %(host)s 上找到类型是 %(console_type)s 的Console "
 "pool。"
 
-#: nova/exception.py:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Console %(console_id)s 没有找到。"
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到Console。"
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr "没有为池 %(pool_id)s 中的实例 %(instance_id)s 找到console."
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "无效的console类型 %(console_type)s "
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr "没有找到实例类型。"
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "名为 %(instance_type_name)s 的实例类型没有找到。"
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "风格 %(flavor_id)s没有找到。"
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr "区域 %(zone_id)s 没有找到。"
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Scheduler Host Filter %(filter_name)s 没有找到。"
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr "Scheduler cost function %(cost_fn_str)s 没有找到。"
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr "未找到Scheduler的权重标记：%(flag_name)s"
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr "实例类型 %(instance_type_id)s 没有额外的 键为%(extra_specs_key)s 的规格说明。"
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr "未定义LDAP对象"
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr "没有找到LDAP用户 %(user_id)s。"
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr "没有找到LDAP用户组 %(group_id)s。"
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr "LDAP用户 %(user_id)s 不是 %(group_id)s 的组成员。"
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "找不到文件 %(file_path)s。"
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr "没找到文件"
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "未找到与网络适配器 %(adapter)s 关联的虚拟交换机。"
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "未找到网络适配器 %(adapter)s。"
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr "操作不允许。"
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr "无法使用全局角色 %(role_id)s"
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr "快照不允许循环。"
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr "备份 image_type 要求循环参数。"
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "密钥对 %(key_name)s 已经存在。"
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr "用户 %(user)s 已存在。"
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr "LDAP用户 %(user)s 已经存在。"
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr "LDAP用户组 %(group)s 已经存在。"
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "用户 %(uid)s 已经是 组 %(group_dn)s 中的成员"
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr "项目 %(project)s 已经存在。"
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "实例 %(name)s 已经存在。"
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "卷类型 %(name)s 已经存在。"
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr "升级错误。"
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "格式错误的消息体： %(reason)s"
 
-#: nova/exception.py:898
+#: nova/exception.py:910
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: nova/exception.py:902
+#: nova/exception.py:914
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
 
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr "未指定Nova访问参数。"
-
-#: nova/exception.py:910
-#, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
-msgstr "无法找到虚拟存储阵列 %(id)d。"
-
-#: nova/exception.py:914
-#, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
-msgstr "无法找到虚拟存储阵列 %(name)s。"
-
 #: nova/exception.py:918
 msgid "When resizing, instances must change size!"
 msgstr "调整时实例的大小必须要发生变化。"
@@ -1066,6 +1072,11 @@ msgstr "实例 %(instance_id)s 没有找到。"
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, fuzzy, python-format
+msgid "Could not fetch image %(image)s"
+msgstr "获取镜像 %(image)s"
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1098,193 +1109,197 @@ msgstr "JSON文件表示策略。"
 msgid "Rule checked when requested rule is not found"
 msgstr "请求的规则找不到时的检查缺省规则。"
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "启动 %(topic)s 节点 (版本 %(vcs_string)s)"
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "为服务 %s 创建消费者"
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr "因无数据库记录，服务已被中止"
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr "服务数据库对象消失，正在重新创建。"
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr "与模型服务器(model server)的连接已恢复！"
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr "失去与模型服务器的连接"
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr "FLAGS全集："
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr "FLAG集合：%(flag)s "
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr "内层异常：%s"
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr "正在抓取 %s"
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "发现未知的 utils.execute 关键字参数：%r"
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "正在运行（在子进程中）运行命令：%s"
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr "运行结果为 %s"
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r 失败，重试。"
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "运行SSH命令：%s"
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr "SSH上不支持环境变量"
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr "SSH上不支持的进程输入参数。"
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr "回调中debug：%s"
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "本地IP地址没有找到：%s"
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s"
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "无效的后台：%s"
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr "后台 %s"
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr "循环调用中。"
 
-#: nova/utils.py:832
-#, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#: nova/utils.py:925
+#, fuzzy, python-format
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在为方法 \"%(method)s\" 试图获取信号量 \"%(lock)s\"...锁"
 
-#: nova/utils.py:836
-#, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#: nova/utils.py:929
+#, fuzzy, python-format
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "为方法 \"%(method)s\" 获得信号量 \"%(lock)s\"...锁"
 
-#: nova/utils.py:840
-#, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#: nova/utils.py:933
+#, fuzzy, python-format
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在为方法 \"%(method)s\" 试图获取锁 \"%(lock)s\"...锁"
 
-#: nova/utils.py:847
-#, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#: nova/utils.py:940
+#, fuzzy, python-format
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "为方法 \"%(method)s\" 获得文件锁 \"%(lock)s\"...锁"
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "不正确的server_string：%s"
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr "正在丢弃原来的异常。"
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "类 %(fullname)s 废弃不用了：%(msg)s"
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "类 %(fullname)s 废弃不用了"
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr "%(location)s 里的函数 %(name)s 已经废弃了：%(msg)s"
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "%(location)s 里的函数 %(name)s 已经废弃了"
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
@@ -1324,6 +1339,11 @@ msgstr "不可用"
 msgid "Returned non-serializeable type: %s"
 msgstr "返回的non-serializeable类型：%s"
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1357,97 +1377,97 @@ msgstr "访问key没有提供"
 msgid "Failure communicating with keystone"
 msgstr "与keystone交流失败"
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "认证失败：%s"
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "为%(uname)s:%(pname)s 验证通过的请求"
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr "执行: %s"
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "为controller=%(controller)s 以及 action=%(action)s未验证的请求"
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "引发InstanceNotFound: %s"
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "引发VolumeNotFound: %s"
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "引发SnapshotNotFound: %s"
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "引起没有找到的错误: %s"
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr "引发EC2APIError: %s"
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "引发KeyPairExists: %s"
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "引发InvalidParameterValue: %s"
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "引发InvalidPortRange: %s"
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "引发NotAuthorized: %s"
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "引发InvalidRequest: %s"
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, fuzzy, python-format
 msgid "ValidatorError raised: %s"
 msgstr "引发InvalidPortRange: %s"
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "引发了意外的错误：%s"
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr "Environment: %s"
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "发生了一个未知的错误. 请重试你的请求."
 
@@ -1461,171 +1481,234 @@ msgstr "不支持的API请求：controller = %(controller)s，action = %(action)
 msgid "Create snapshot of volume %s"
 msgstr "创建卷 %s 的快照"
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, fuzzy, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr "参数GroupName的值 (%s) 无效。内容仅限于含有字母数字的字符，空格，破折号和下划线。"
+
+#: nova/api/ec2/cloud.py:379
+#, fuzzy, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr "参数GroupName的值 (%s) 无效。长度超过了上限255。"
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr "创建键值对 %s"
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr "导入key %s"
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr "删除键值对 %s"
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "无效的"
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr "撤销 %s 安全组入口权限"
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, fuzzy, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr "参数不够创建有效规则。"
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr "对给定的参数无特定规则。"
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr "授予 %s 安全组入口权限"
+
+#: nova/api/ec2/cloud.py:723
+#, fuzzy, python-format
+msgid "%s - This rule already exists in group"
+msgstr "这条规则已经存在于组%s 中"
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr "参数GroupName的值 (%s) 无效。内容仅限于含有字母数字的字符，空格，破折号和下划线。"
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr "参数GroupName的值 (%s) 无效。长度超过了上限255。"
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "获取虚拟机 %s 控制台输出"
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "从快照 %s 创建卷"
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的卷"
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+#, fuzzy
+msgid "Delete Failed"
+msgstr "创建失败"
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "把卷 %(volume_id)s 加载到 %(device)s 的实例 %(instance_id)s 上"
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+#, fuzzy
+msgid "Attach Failed."
+msgstr "创建失败"
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr "卸载卷 %s"
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+#, fuzzy, python-format
+msgid "Detach Volume Failed."
+msgstr "卸载卷 %s"
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute不支持: %s"
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr "分配地址"
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr "释放地址 %s"
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "把地址 %(public_ip)s 关联到实例 %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr "解除地址 %s 的关联"
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr "镜像必须可用。"
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr "准备开启终止实例"
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr "重启实例 %r"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr "准备停止实例"
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr "准备启动实例"
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr "解除镜像 %s注册"
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "用 id %(image_id)s注册镜像 %(image_location)s"
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr "用户或者组没有确定"
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr "仅仅支持组\"all\""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr "operation_type必须添加或者移除"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "正在更新镜像 %s 的 publicity 属性"
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "无法在 %d 秒内停止实例"
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr "为ip： %s获取元数据失败"
@@ -1694,36 +1777,46 @@ msgstr "没有为提供的API key找到用户。"
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr "提供的API key有效，但并不是给用户 '%(username)s' 的。"
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr "limit param必须是整数"
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr "limit param必须是正数"
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr "offset param必须是整数"
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr "offset param必须是正数"
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr "没有找到marker [%s]"
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr "href %s 不包含版本"
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr "超过镜像元数据限制"
 
+#: nova/api/openstack/common.py:291
+#, fuzzy, python-format
+msgid "Converting nw_info: %s"
+msgstr "虚拟机的network_info：|%s|"
+
+#: nova/api/openstack/common.py:301
+#, fuzzy, python-format
+msgid "Converted networks: %s"
+msgstr "意外错误：%s"
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1792,12 +1885,12 @@ msgstr "Calling extension factory %s"
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "加载扩展 %(classpath)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr "加载扩展 %(ext_name)s 失败：%(exc)s"
@@ -1853,7 +1946,7 @@ msgstr "没有该动作：%s"
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr "不合法的请求主体"
 
@@ -1870,20 +1963,20 @@ msgstr "不合法的请求url"
 msgid "%(url)s returned a fault: %(e)s"
 msgstr "%(url)s返回错误：%(e)s"
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr "元素不是子节点"
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr "根元素选择列表"
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr "模板数不匹配；为master %(mastertag)s 增加 slave %(slavetag)s"
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr "subclasses必须执行construct()!"
 
@@ -1893,8 +1986,8 @@ msgid "Initializing extension manager."
 msgstr "正在初始化扩展管理员。"
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr "镜像没有找到。"
 
@@ -1971,179 +2064,183 @@ msgstr "Personality 文件路径太长"
 msgid "Personality file content too long"
 msgstr "Personality 文件内容太长"
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr "服务器名称不是字符串或者unicode"
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr "服务器名称是空串"
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "错误的personality 格式：丢失 %s"
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr "损坏的 personality 格式"
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "Personality %s的内容无法解码"
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "损坏的网络格式：网络 uuid 格式不正确 (%s)"
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "不正确的固定 IP 地址(%s)"
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "不允许重复的网络(%s)"
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "错误的网络格式：丢失%s"
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr "错误的网络格式"
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr "Userdata 内容无法解码"
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 不是正确的IPv4格式"
 
-#: nova/api/openstack/compute/servers.py:628
+#: nova/api/openstack/compute/servers.py:597
+#, fuzzy
+msgid "accessIPv6 is not proper IPv6 format"
+msgstr "accessIPv4 不是正确的IPv4格式"
+
+#: nova/api/openstack/compute/servers.py:629
 msgid "Server name is not defined"
 msgstr "服务器名称未定义"
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
-msgstr "提供了错误的imageRef。"
-
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr "提供了无效的flavorRef。"
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr "无法找到请求的镜像"
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr "提供了无效的key_name。"
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr "虚拟机还没有调整大小。"
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr "confirm-resize中的错误 %s"
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr "revert-resize中的错误 %s"
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "重启的参数'type'既不是HARD也不是SOFT"
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr "缺少重启的参数'type'"
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr "重启中错误 %s"
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr "无法找到请求的风格。"
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr "调整大小需要尺寸的改变。"
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr "非正常的服务器实体"
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr "缺少属性imageRef"
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr "提供了错误的imageRef。"
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr "缺少属性flavorRef"
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr "没有确定adminPass"
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr "无效的adminPass"
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr "无法解析元数据键/值对"
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "调整大小请求中的属性'flavorRef'无效。"
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "调整大小请求要求有属性'flavorRef'。"
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr "无效的请求主体"
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr "无法解析请求中的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr "无法找到实例"
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr "无法找到用来重新创建的镜像"
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr "实体createImage需要属性name"
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr "无效的元数据"
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
@@ -2182,7 +2279,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr "没有找到服务器"
 
@@ -2215,8 +2312,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr "createBackup的属性 'rotation'必须是整数"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2234,46 +2331,46 @@ msgstr "host与block_migration必须确定"
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr "实例 %(id)s 到主机 %(host)s 的动态迁移失败"
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, fuzzy, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr "无法创建名称为 %(name)s 规格为 %(extra_specs)s 的卷类型。"
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, fuzzy, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr "更新代理失败：%(resp)r"
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr "Aggregates没有动作 %s"
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2306,8 +2403,8 @@ msgstr "%s 必须是'MANUAL' 或者 'AUTO'。"
 msgid "Server not found."
 msgstr "没有找到服务器。"
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 #, fuzzy
 msgid "Flavor not found."
 msgstr "没有找到服务器。"
@@ -2328,8 +2425,8 @@ msgstr "没有更多的浮动ip。"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr "缺少参数 dict"
 
@@ -2371,11 +2468,11 @@ msgstr "把主机 %(host)s 设置为 %(state)s。"
 msgid "Setting host %(host)s to %(state)s."
 msgstr "把主机 %(host)s 设置为 %(state)s。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource是只有管理员才能执行的功能。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr "没有找到主机"
 
@@ -2473,11 +2570,6 @@ msgstr "父组id不是整数"
 msgid "Security group (%s) not found"
 msgstr "没有找到安全组 (%s)"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr "授予 %s 安全组入口权限"
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr "参数不够创建有效规则。"
@@ -2495,27 +2587,22 @@ msgstr "父组id或者组id不是整数"
 msgid "Parent group id and group id cannot be same"
 msgstr "父组id和组id不能一样"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr "规则id不是整数"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr "撤销 %s 安全组入口权限"
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr "没有指定安全组"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr "安全组名称不能是空"
 
@@ -2529,82 +2616,6 @@ msgstr "启动实例 %r"
 msgid "stop instance %r"
 msgstr "停止实例 %r"
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr "没有提供主体"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr "创建类型 %(vc_type)s 的VSA %(display_name)s"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr "删除id：%s的VSA"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr "把地址 %(ip)s 与VSA %(id)s关联"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr "把地址与VSA %(id)s解除关联"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr "没有找到ID是 %(id)s 的 %(obj)s"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr "ID是 %(id)s 的 %(obj)s 属于VSA %(own_vsa_id)s而不是VSA %(vsa_id)s。"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr "索引。vsa_id=%(vsa_id)s"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr "详细内容。vsa_id=%(vsa_id)s"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr "创建卷。vsa_id=%(vsa_id)s, body=%(body)s"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr "从VSA ID %(vsa_id)s 为创建 %(size)s GB的卷"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr "更新%(obj)s至id：%(id)s ，修改：%(changes)s"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr "删除卷。vsa_id=%(vsa_id)s, id=%(id)s"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr "显示卷。vsa_id=%(vsa_id)s, id=%(id)s"
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr "为 VSA %s 索引实例"
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2628,7 +2639,7 @@ msgstr "把卷 %(volume_id)s 挂载到实例 %(server_id)s 的 %(device)s 设备
 msgid "Delete snapshot with id: %s"
 msgstr "删除id为 %s 的快照"
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2645,133 +2656,133 @@ msgid ""
 "instead."
 msgstr "尝试删除组中最后一个成员，用删除组 %s 来代替。"
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr "查找用户：%r"
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "访问密钥 %s 授权失败"
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "使用用户名称来作为项目名称 (%s)"
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr "授权失败：没有此项目名称 %(pjid)s (user=%(uname)s)"
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr "授权失败：用户 %(uname)s 不是管理员，也不是项目 %(pjname)s 的成员"
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr "user.secret: %s"
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr "expected_signature: %s"
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr "signature: %s"
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "用户 %s 的签名无效"
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr "host_only_signature: %s"
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr "必须指定项目"
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "为 %(pid)s 项目里的用户 %(uid)s 添加角色 %(role)s"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr "为用户 %(uid)s 添加全局角色 %(role)s"
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr "在项目 %(pid)s 里移除用户 %(uid)s 的角色 %(role)s"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr "移除用户 %(uid)s 的全局角色 %(role)s"
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "创建管理用户为 %(manager_user)s 项目%(name)s"
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr "正在修改项目 %s"
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "往项目%(pid)s 添加用户%(uid)s"
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "从项目 %(pid)s 移除用户 %(uid)s"
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr "删除项目 %s"
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "已创建用户 %(rvname)s (admin: %(rvadmin)r)"
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr "删除用户 %s"
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "修改用户 %s 的访问密钥"
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "修改用户 %s 的私钥"
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "将用户 %(uid)s 的管理员状态设置为 %(admin)r"
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "没有 %s 项目的vpn数据"
@@ -2798,122 +2809,128 @@ msgstr "子网掩码已存入openvpn配置"
 msgid "Launching VPN for %s"
 msgstr "启动VPN %s"
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr "未指定计算宿主机"
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr "无法找到实例 %s 的宿主机"
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr "%(pid)s 已经超过配额，试图设置 %(num_metadata)s 个元数据属性"
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr "%(pid)s 已经超过配额，元数据属性键或值太长"
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
-msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
-
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:257
+#, fuzzy
+msgid "Cannot run any more instances of this type."
 msgstr "超过实例的配额。您无法运行更多此类型的实例。"
 
-#: nova/compute/api.py:219
-#, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+#: nova/compute/api.py:259
+#, fuzzy, python-format
+msgid "Can only run %s more instances of this type."
 msgstr "超过实例的配额。您只能再运行 %s 个此类型的实例。"
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:261
+#, fuzzy, python-format
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
+msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
+
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr "正在创建裸实例"
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr "使用 Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备运行 %s 个实例"
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr "为 %(pid)s/%(uid)s 向scheduler发送创建命令"
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "准备尝试软删除实例 %s"
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 #, fuzzy, python-format
 msgid "No host for instance, deleting immediately"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "准备尝试删除实例 %s"
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "准备尝试停止实例 %s"
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "准备尝试启动实例 %s"
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr "实例 %(instance_uuid)s 没有停止。(%(vm_state)s"
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "搜索条件： %s"
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr "无法识别镜像类型 %s"
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。假定在升级。"
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr "旧的实例类型 %(current_instance_type_name)s，新的实例类型 %(new_instance_type_name)s"
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr "存在多个固定IP，使用第一个：%s"
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr "未指定计算宿主机"
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr "无法找到实例 %s 的宿主机"
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr "创建参数必须是正整数"
@@ -2967,57 +2984,55 @@ msgstr "check_instance_lock:  未执行 |%s|"
 msgid "Unable to load the virtualization driver: %s"
 msgstr "无法加载虚拟驱动：%s"
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "当前状态是 %(drv_state)s，数据库状态是 %(db_state)s。"
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute重启后，实例正在重启。"
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Hypervisor驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr "正在检查状态"
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "正在设置 bdm %s"
 
-#: nova/compute/manager.py:392
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr "准备强制删除虚拟机 %(instance_uuid)s，即使已经删除了。"
-
-#: nova/compute/manager.py:398
-#, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
-msgstr "数据库中不存在虚拟机 %(instance_uuid)s，但是无论如何要用特殊上下文来关闭。"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
+msgstr ""
 
-#: nova/compute/manager.py:404
-#, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+#: nova/compute/manager.py:406
+#, fuzzy, python-format
+msgid "Exception encountered while terminating the instance %s"
 msgstr "终止虚拟机 %(instance_uuid)s 时发生异常"
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr "未找到虚拟机 %s"
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr "虚拟机已经创建"
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3026,7 +3041,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3035,135 +3050,131 @@ msgstr ""
 "镜像 '%(image_id)s'  的大小为 %(size_bytes)d ，超过虚拟机类型 instance_type 所允许的大小 "
 "%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr "正在启动虚拟机"
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr "虚拟机跳过网络分配"
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr "虚拟机网络设置失败"
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "虚拟机的network_info：|%s|"
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr "虚拟机块设备设置失败"
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr "虚拟机启动失败"
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr "释放虚拟机的网络"
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 虚拟机"
 
-#: nova/compute/manager.py:678
-#, python-format
-msgid "trying to destroy already destroyed instance: %s"
-msgstr "尝试销毁已经销毁的实例: %s"
-
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:699
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:708
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
+#, python-format
+msgid "%s. Setting instance vm_state to ERROR"
+msgstr "%s。把实例的 vm_state设置为ERROR"
+
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr "无法重建虚拟机 [%(instance_uuid)s]，应为给的的镜像不存在。"
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr "无法重新创建实例 [%(instance_uuid)s]: %(exc)s"
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr "正在重新创建实例 %s"
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr "正在重启虚拟机 %s"
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr "试图重启一个没有运行的实例：%(instance_uuid)s (状态：%(state)s 预计：%(running)s)"
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr "无法识别镜像类型 %s"
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "实例 %s: 快照中"
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr "试图为一个没有运行的实例快照：%(instance_uuid)s (状态：%(state)s 预计：%(running)s)"
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "找到 %(num_images)d 个镜像 (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮换出%d个备份"
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜像 %s"
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr "实例 %s：Root密码已设置"
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr "设置管理员密码出错"
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
@@ -3172,12 +3183,12 @@ msgstr ""
 "试图把一个文件注入到没有运行的实例：%(instance_uuid)s (状态: %(current_power_state)s 预计: "
 "%(expected_state)s)"
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr "实例 %(instance_uuid)s：把文件注入 %(path)s"
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
@@ -3186,179 +3197,173 @@ msgstr ""
 "试图更新没有运行的实例上agent：%(instance_uuid)s (状态: %(current_power_state)s 预计: "
 "%(expected_state)s)"
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr "实例 %(instance_uuid)s：正在把agent更新到 %(url)s"
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr "虚拟机 %s：正在修复中"
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr "虚拟机 %s：取消修复"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr "目标与来源一样。"
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr "实例 %s：正在迁移"
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr "%s。把实例的 vm_state设置为ERROR"
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr "实例 %s: 暂停"
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr "实例 %s: 取消暫停"
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr "实例 %s: 取消检测"
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr "虚拟机 %s：挂起"
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr "实例 %s: 唤醒中。。。"
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr "实例%s:锁定中"
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr "实例%s:取消锁定"
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr "实例%s：获取锁状态"
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr "实例%s:重置网络"
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr "实例 %s：注入网络信息"
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr "实例 %s：正在获得VNC console"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "在 %(mountpoint)s 通过卷 %(volume_id)s 启动"
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, fuzzy, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 挂载到 %(mountpoint)s"
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 挂载到 %(mountpoint)s"
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, fuzzy, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr "%(mountpoint)s 挂载失败，移除中"
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr "%(mountpoint)s 挂载失败，移除中"
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "从挂载点 %(mp)s 卸载卷 %(volume_id)s"
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr "从未知实例%s中移除卷"
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr "创建tmpfile %s通知其他计算节点它们应该挂载同一个存储。"
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr "实例没有卷。"
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr "plug_vifs() 失败%(cnt)d 次。为主机 %(hostname)s 重试到%(max_retry)d次。"
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "预在线迁移在%(dest)s失败"
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr "post_live_migration()已经启动。"
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr "在线迁移：未知错误：无法继承浮动ip。%(e)s"
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "把实例迁移到 %(dest)s 成功完成。"
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3366,65 +3371,79 @@ msgstr ""
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。”这个错误可以放心的忽略。"
 
-#: nova/compute/manager.py:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr "迁移后操作启动"
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr "更新主机状态"
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr "在数据库中找到 %(num_db_instances)s个实例，在hypervisor找到 %(num_vm_instances)s 个实例。"
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 #, fuzzy, python-format
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr "数据库中发现虚拟机 %(name)s ，但是hypervisor不知道。设置加电状态为NOSTATE"
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..."
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的虚拟机"
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr "检测标签名为 '%(name_label)s' 的实例，这些实例被标识为被删除的却仍然存在于主机上。"
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, fuzzy, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr "销毁标签名为 '%(name_label)s' 的实例，这些实例被标识为被删除的却仍然存在于主机上。"
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr "无法识别的FLAGS的取值 '%(action)s'。running_deleted_instance_action"
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3499,31 +3518,31 @@ msgstr "接收到令牌：%(token)s, %(token_dict)s)"
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "检查令牌：%(token)s, %(token_valid)s)"
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr "使用空的请求上下文已经废弃不用了"
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "无法识别的 read_deleted 取值”%s“"
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr "主机 %(host)s 没有计算节点"
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr "没有id为%(sm_backend_id)s的后台配置"
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr "没有 sm_flavor 调用 %(sm_flavor)s"
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "没有id为 %(volume_id)s 的 sm_volume"
@@ -3536,11 +3555,6 @@ msgstr "没有安装 python-migrate。正退出。"
 msgid "version should be an integer"
 msgstr "版本应该是整数"
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr "SQL连接失败 (%(connstring)s)。还剩 %(attempts)d 次。"
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr "interface 列没有加入networks 表中"
@@ -3548,6 +3562,7 @@ msgstr "interface 列没有加入networks 表中"
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr "表 |%s| 没有创建"
@@ -3606,74 +3621,79 @@ msgstr "progress 列没有加入到 compute_nodes 表中"
 msgid "dns_domains table not dropped"
 msgstr "dns_domains 表没有删除"
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#, fuzzy
+msgid "quota_classes table not dropped"
+msgstr "instance_info_caches 没有删除掉"
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr "glance服务器连接错误，重试中"
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr "达到最大尝试次数"
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr "正在Glance中创建镜像。元数据 %s 已经传入。"
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr "为Glance 进行格式化后的元数据 %s"
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr "从Glance返回的为Base %s 格式化的元数据"
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr "不是镜像所有者"
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr "%(timestamp)s 没有遵循任何签名格式：%(iso_formats)s"
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr "把 %(image_location)s 下载到 %(image_path)s失败"
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr "解密 %(image_location)s 到 %(image_path)s失败"
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr "解压缩 %(image_location)s 到 %(image_path)s 失败"
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr "上传 %(image_location)s 到 %(image_path)s 失败"
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr "解密私钥失败：%s"
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr "解密初始化vector失败：%s"
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr "解密镜像文件 %(image_file)s 失败：%(err)s"
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr "不安全的镜像文件名"
 
@@ -3696,94 +3716,108 @@ msgstr "不恰当的to_global_ipv6 oject_id；%s"
 msgid "This driver only supports type 'a' entries."
 msgstr "驱动仅支持入口类型 'a'。"
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "试图移除不存在的链 %s。"
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "位置链：%r"
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr "试图移除不存在的规则：%(chain)r %(rule)r %(wrap)r %(top)r"
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.apply成功完毕"
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr "没有找到实例 %(instance_id)s"
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "重启进程 dnsmasq 时抛出 %s"
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d 过期了，重新启动dnsmasq"
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "杀掉进程 radvd 时抛出 %s"
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d 过期了，重新启动radvd"
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "正在开启VLAN接口 %s"
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "正在为 %s 开启桥接口"
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, fuzzy, python-format
+msgid "Starting bridge %s "
+msgstr "保证 bridge %s"
+
+#: nova/network/linux_net.py:1145
+#, fuzzy, python-format
+msgid "Done starting bridge %s"
+msgstr "保证 bridge %s"
+
+#: nova/network/linux_net.py:1163
+#, fuzzy, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr "去除虚拟机”%s“的虚拟网络设备时失败"
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr "没有找到接口 %(interface)s"
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr "为实例 |%s| 分配浮动IP"
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr "为实例 |%s| 释放浮动IP"
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "地址 |%(address)s| 没有分配"
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr "没有为你的项目 |%(project)s| 分配地址 |%(address)s|"
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr "%s 的配额超出，尝试分配地址"
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3791,41 +3825,41 @@ msgid ""
 "ignored."
 msgstr "数据库不一致：DNS域|%s| 在Nova数据库中注册，但是对浮动或者实例DNS驱动均不可见。将被忽略。"
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "域 |%(domain)s| 已经存在，把区域改变为 |%(av_zone)s|。"
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "域 |%(domain)s| 已经存在，把项目改变为 |%(project)s|。"
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "解除 %s 过期固定ip的关联"
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr "设置网络主机"
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr "为实例 |%s| 的网路分配"
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr "为实例 |%(instance_id)s| 获取的网络：|%(networks)s|"
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr "为实例 |%s| 解除网络分配"
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3835,68 +3869,68 @@ msgstr ""
 "instance-dns-zone是 |%(domain)s|，该域位于区域 |%(zone)s| 中。实例|%(instance)s| 在区域 "
 "|%(zone2)s| 里。没有DNS记录将创建。"
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "租用的IP |%(address)s|"
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "没有关联的IP %s 被租用了"
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "没有分配的IP |%s| 被租用了"
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "释放的IP |%(address)s|"
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "没有关联的IP %s 被释放了"
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "没有租用的IP %s 被释放了"
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr "cidr 已经在使用"
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲突"
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的较小的cidr (%(smaller)s) 冲突"
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr "网络已经存在。"
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "网路在删除前必须与项目 %s 解除关联"
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "网络数量与VLAN起始数之和不能大于4049"
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3911,7 +3945,7 @@ msgstr "驱动仅支持类型 'a'"
 msgid "Tenant ID not set"
 msgstr "租户ID没有设"
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr "Quantum客户请求：%(method)s %(action)s"
@@ -3921,7 +3955,7 @@ msgstr "Quantum客户请求：%(method)s %(action)s"
 msgid "Quantum entity not found: %s"
 msgstr "Quantum实体没有找到：%s"
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr "服务器 %(status_code)s 错误：%(data)s"
@@ -3931,7 +3965,7 @@ msgstr "服务器 %(status_code)s 错误：%(data)s"
 msgid "Unable to connect to server. Got error: %s"
 msgstr "无法连接到服务器。出现错误：%s"
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr "无法反序列化type = '%s' 的对象"
@@ -3964,42 +3998,42 @@ msgstr "QuantumManager 没有使用 'bridge_interface' 参数。"
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr "QuantumManager 要求一个有效的 (.1) 网关地址。"
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr "无法为net-id是 '%(quantum_net_id)s'的租户 '%(q_tenant_id)s' 找到已存在的quantum网络"
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr "实例 %s 的网络分配"
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr "实例的端口取消分配失败：|%(instance_id)s|, port_id: |%(port_id)s|"
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr "实例的ipam取消分配失败：|%(instance_id)s|, vif_uuid: |%(vif_uuid)s|"
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr "服务器返回错误：%s"
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr "melange服务的连接错误，重试"
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -4023,16 +4057,16 @@ msgid "No network with net_id = %s"
 msgstr "没有net_id = %s的网络"
 
 #: nova/network/quantum/nova_ipam_lib.py:221
-#, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+#, fuzzy, python-format
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr "没有为vif %sid取消分配固定IP"
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr "为 %(tenant_id)s 连接接口 %(interface_id)s 到net %(net_id)s"
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr "为 %(tenant_id)s 在net %(net_id)s 删除端口 %(port_id)s"
@@ -4042,7 +4076,7 @@ msgstr "为 %(tenant_id)s 在net %(net_id)s 删除端口 %(port_id)s"
 msgid "%s not in valid priorities"
 msgstr "%s 不在有效的优先级"
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4054,56 +4088,56 @@ msgstr "Problem '%(e)s' 试图发送到通知系统。Payload=%(payload)s"
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr "Problem '%(e)s' 试图发送到通知驱动 %(driver)s。"
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "返回 %s 异常给调用者"
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr "未打开的上下文：%s"
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr "已接收 %s"
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr "没有适用于消息 %s 的方法"
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr "没有适用于消息 %s 的方法"
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr "在 %s 做异步call"
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "消息ID(MSG_ID)是 %s"
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "在 %s 做异步cast"
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr "做异步fanout cast"
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr "正在 %s 上发送通知"
@@ -4121,119 +4155,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr "等待RPC返回超时"
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr "%(fl_host)s:%(fl_port)d上的AMQP服务器不可达：%(e)s。 %(fl_intv)d 秒钟后再尝试。"
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr "%(tries)d 次尝试后依然无法连接到AMQP服务器。正在关闭。"
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr "重新与队列建立连接"
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr "从队列获取消息失败：%s"
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr "为%s初始化适配器消费者(Adapter Consumer)"
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr "用路由key \"%(key)s\" 创建了\"%(exchange)s\" fanout exchange"
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr "处理消费者出现异常"
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr "正在创建 \"%(exchange)s\" fanout exchange"
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr "回复 %s"
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr "话题是 %s"
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr "消息 %s"
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr "正在重新连接%(hostname)s:%(port)d的服务器"
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr "连接到%(hostname)s:%(port)d的服务器"
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr "%(max_retries)d 次尝试后无法连接到位于%(hostname)s:%(port)d的AMQP server：%(err_str)s"
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr "位于%(hostname)s:%(port)d的AMQP server不可达：%(err_str)s。%(sleep_time)d 秒钟后请再尝试。"
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr "为topic '%(topic)s'声明消费者失败：%(err_str)s"
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr "等待RPC答复超时：%s"
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr "从队列中消费消息失败：%s"
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr "给topic '%(topic)s'发布消息失败：%(err_str)s"
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr "无法连接到AMQP服务器：%s "
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr "连接到 %s 的AMQP服务器"
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr "重建AMQP队列"
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4243,30 +4285,6 @@ msgstr "正确的服务在运行吗？"
 msgid "Could not find another compute"
 msgstr "无法找到另一个计算节点"
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr "没有主机选择所定义的 %s 主题消息"
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr "尝试创建 %(num_instances)d 个虚拟机"
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr "Scheduler 只能理解计算节点（暂时）"
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr "过滤掉的主机 %(hosts)s"
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr "加权的主机 %(weighted_host)s"
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4291,68 +4309,122 @@ msgstr "设置“%(method)s”成 %(topic)s 节点 \"%(host)s\""
 msgid "Must implement a fallback schedule"
 msgstr "必须实现一个回滚 schedule"
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr "块存储迁移无法使用共享存储"
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr "无法确认tmpfile %(ipath)s 在相同的共享存储的 %(src)s 和 %(dest)s之间。"
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr "主机 %(dest)s 和原先的主机 %(src)s 不兼容。"
 
-#: nova/scheduler/driver.py:409
-#, python-format
+#: nova/scheduler/driver.py:419
+#, fuzzy, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr "无法迁移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 虚拟机：%(mem_inst)s)"
 
-#: nova/scheduler/driver.py:465
-#, python-format
+#: nova/scheduler/driver.py:475
+#, fuzzy, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 "无法迁移%(instance_id)s 到 %(dest)s 上：缺少磁盘(主机:%(available)s <= "
 "虚拟机:%(necessary)s)"
 
-#: nova/scheduler/host_manager.py:259
+#: nova/scheduler/filter_scheduler.py:51
+#, python-format
+msgid "No host selection for %s defined."
+msgstr "没有主机选择所定义的 %s 主题消息"
+
+#: nova/scheduler/filter_scheduler.py:64
+#, python-format
+msgid "Attempting to build %(num_instances)d instance(s)"
+msgstr "尝试创建 %(num_instances)d 个虚拟机"
+
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
+msgstr "Scheduler 只能理解计算节点（暂时）"
+
+#: nova/scheduler/filter_scheduler.py:199
+#, python-format
+msgid "Filtered %(hosts)s"
+msgstr "过滤掉的主机 %(hosts)s"
+
+#: nova/scheduler/filter_scheduler.py:209
+#, python-format
+msgid "Weighted %(weighted_host)s"
+msgstr "加权的主机 %(weighted_host)s"
+
+#: nova/scheduler/host_manager.py:144
+#, python-format
+msgid "Host filter fails for ignored host %(host)s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:151
+#, python-format
+msgid "Host filter fails for non-forced host %(host)s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:157
+#, python-format
+msgid "Host filter function %(func)s failed for %(host)s"
+msgstr ""
+
+#: nova/scheduler/host_manager.py:163
+#, fuzzy, python-format
+msgid "Host filter passes for %(host)s"
+msgstr "主机 %(host)s 没有计算节点"
+
+#: nova/scheduler/host_manager.py:272
 #, python-format
 msgid "Received %(service_name)s service update from %(host)s."
 msgstr "在 %(host)s 上接收到 %(service_name)s 服务更新。"
 
-#: nova/scheduler/host_manager.py:300
+#: nova/scheduler/host_manager.py:313
 msgid "host_manager only implemented for 'compute'"
 msgstr "host_manager 只实现了“compute”"
 
-#: nova/scheduler/host_manager.py:310
+#: nova/scheduler/host_manager.py:323
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "计算节点 %s 没有服务"
 
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#: nova/scheduler/manager.py:85
+#, fuzzy, python-format
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr "驱动方法 %(driver_method)s 丢失：%(e)s。撤销回schedule()"
 
-#: nova/scheduler/manager.py:102
+#: nova/scheduler/manager.py:150
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
 
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
+#: nova/scheduler/manager.py:159
+#, fuzzy, python-format
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr "设置虚拟机 %(instance_uuid)s 至 ERROR 状态"
 
-#: nova/scheduler/scheduler_options.py:67
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr "无法统计 scheduler  的选项文件 %(filename)s：“%(e)s”"
@@ -4370,107 +4442,6 @@ msgstr "没有足够可分配的剩余CPU核心"
 msgid "Not enough allocatable volume gigabytes remaining"
 msgstr "卷没有足够可分配的空间"
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
-msgstr "_filter_hosts: %(request_spec)s"
-
-#: nova/scheduler/vsa.py:115
-#, python-format
-msgid "Filter hosts for drive type %s"
-msgstr "按照驱动类型 %s 过滤主机"
-
-#: nova/scheduler/vsa.py:132
-#, python-format
-msgid "Host %s has no free capacity. Skip"
-msgstr "主机 %s 没有足够的能力。跳过"
-
-#: nova/scheduler/vsa.py:137
-#, python-format
-msgid "Filter hosts: %s"
-msgstr "过滤主机：%s"
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
-msgstr "必须实现主机选择机制"
-
-#: nova/scheduler/vsa.py:163
-#, python-format
-msgid "Maximum number of hosts selected (%d)"
-msgstr "所选择主机的最大数目(%d)"
-
-#: nova/scheduler/vsa.py:171
-#, python-format
-msgid "Selected excessive host %(host)s"
-msgstr "选择超过了主机 %(host)s"
-
-#: nova/scheduler/vsa.py:211
-#, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
-msgstr "在主机 %(host)s 提供大小为 %(size)s GB 的卷 %(name)s"
-
-#: nova/scheduler/vsa.py:239
-#, python-format
-msgid "volume_params %(volume_params)s"
-msgstr "volume_params %(volume_params)s"
-
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
-msgstr "%(i)d：卷名%(name)s"
-
-#: nova/scheduler/vsa.py:282
-#, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr "正在尝试创建 %(num_volumes)d 个卷"
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
-msgstr "创建卷失败"
-
-#: nova/scheduler/vsa.py:328
-#, python-format
-msgid "Non-VSA volume %d"
-msgstr "Non-VSA 卷 %d"
-
-#: nova/scheduler/vsa.py:341
-#, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr "正在创建驱动类型为%(drive_type)s 的卷 %(volume_id)s"
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
-msgstr "创建卷失败"
-
-#: nova/scheduler/vsa.py:391
-#, python-format
-msgid "No capability selected for volume of size %(size)s"
-msgstr "没有能力分配大小为 %(size)s 的卷"
-
-#: nova/scheduler/vsa.py:411
-#, python-format
-msgid "Host %s:"
-msgstr "主机 %s："
-
-#: nova/scheduler/vsa.py:420
-#, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
-msgstr "\t驱动 %(qosgrp)-25s：总共 %(total)2s，已用 %(used)2s， 空闲 %(free)2s。可用 %(avail)-5s"
-
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
-msgstr "\t [ tab] LeastUsedHost：最佳主机： %(best_host)s。(使用的空间 %(min_used)s)"
-
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
-msgstr "\t MostAvailCap：最佳主机： %(best_host)s。 (可用 %(max_avail)s %(type_str)s)"
-
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
 msgstr "未设置 VCPUs；假设 CPU 集合损坏了"
@@ -4525,34 +4496,34 @@ msgstr "伪命令引起异常 %s"
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "伪命令的标准输出stdout='%(stdout)s' 标准错误 stderr='%(stderr)s'"
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr "请扩展模拟的 libvirt 模块来支持 flags"
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr "请扩展伪libvirt模块来支持这种认知方法"
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr "正在运行的虚拟机：%s"
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "终结虚拟机实例之后：%s"
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr "内部错误"
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "强制杀死虚拟机实例后：%s"
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4617,48 +4588,37 @@ msgstr "给定数据：%s"
 msgid "Result data: %s"
 msgstr "结果数据：%s"
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr "测试：模拟错误的 VSA 名称。抛出异常"
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr "测试：Emulate DB error。抛出"
-
-#: nova/tests/test_vsa.py:161
-#, python-format
-msgid "Test: user_data = %s"
-msgstr "测试：user_data = %s"
-
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:621
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "在%s 创建文件模拟客户代理"
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/test_xenapi.py:632
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "移除在 %s 的模拟的客户代理文件"
 
+#: nova/tests/api/openstack/compute/test_servers.py:2102
+#, fuzzy, python-format
+msgid "Quota exceeded: code=%(code)s"
+msgstr "超出配额"
+
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
 #, python-format
 msgid "_create: %s"
 msgstr "_create: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr "_delete: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr "_get: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr "_get_all: %s"
@@ -4693,11 +4653,6 @@ msgstr "test_snapshot_show: resp=%s"
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr "test_snapshot_detail: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr "_create: param=%s"
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4755,77 +4710,37 @@ msgstr "未知的状态码"
 msgid "Decoding JSON: %s"
 msgstr "解码JSON：%s"
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested return %s"
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr "RPC后台不支持超时"
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr "主机 %s"
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr "测试：在主机 %(host)s 上提供 %(name)s"
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr "\t vol=%(vol)s"
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr "测试：VSA更新请求：vsa_id=%(vsa_id)s values=%(values)s"
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr "测试：卷创建：%s"
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr "测试：卷获取请求：id=%(volume_id)s"
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr "测试：卷获取请求：id=%(volume_id)s values=%(values)s"
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr "测试：卷获取：id=%(volume_id)s"
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr "打开hypervisor的连接失败"
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr "Compute_service记录为 %s 创建 "
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr "Compute_service记录为 %s 更新 "
@@ -4849,21 +4764,21 @@ msgstr "提供者防火墙规则刷新"
 msgid "Adding security group rule: %r"
 msgstr "添加安全组规则：%r"
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "添加提供者规则：%s"
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr "'qemu-img info'解析失败"
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr "fmt=%(fmt)s 由 %(backing_file)s 支持"
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr "转化为裸格式，但目前格式是 %s"
@@ -4899,7 +4814,7 @@ msgstr "任务 [%(task_name)s] %(task_ref)s 状态：错误 %(error_info)s"
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "在vmwareapi：_poll_task，得到这个错误 %s"
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -4908,33 +4823,23 @@ msgstr ""
 "针对use connection_type=xenapi必须指定xenapi_connection_url, "
 "xenapi_connection_username (可选) 和 xenapi_connection_password"
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator名字"
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr "不支持在XenServer启动主机"
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0磁盘是空么？)"
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr "任务 [%(name)s] %(task)s 状态：成功 %(result)s"
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr "任务 [%(name)s] %(task)s 状态：%(status)s %(error_info)s"
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
@@ -5117,7 +5022,7 @@ msgstr "过量使用裸机分配"
 msgid "instance %s: Creating image"
 msgstr "实例 %s：正在创建镜像"
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr "实例 %(inst_name)s：将 %(injection)s 注入镜像 %(img_id)s"
@@ -5139,7 +5044,7 @@ msgstr "实例 %s：开始方法 toXML"
 msgid "instance %s: finished toXML method"
 msgstr "实例 %s：方法toXML 完成"
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5154,8 +5059,8 @@ msgstr "#### RLK: cpu_arch = %s "
 msgid "Updating!"
 msgstr "正在更新。"
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr "正在更新主机状态"
 
@@ -5180,44 +5085,58 @@ msgstr "rootfs 已经被移除了"
 msgid "Before ping to the bare-metal node"
 msgstr "在ping纯硬件节点之前"
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr "activate_node"
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr "节点处于未知的错误状态。"
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr "没有合适的镜像handler配置好"
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr "未知的磁盘进行handler：%s"
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr "镜像已经挂载"
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "挂载文件系统失败：%s"
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr "移除容器失败：%s"
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5263,159 +5182,156 @@ msgstr "qemu-nbd 错误：%s"
 msgid "nbd device %s did not show up"
 msgstr "nbd 设备 %s 没有出现"
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr "连接 libvirt 失败"
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "销毁时发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr "删除已保存的虚拟机时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr "虚拟机销毁成功。"
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, fuzzy, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr "在 undefine 时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s"
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "删除虚拟机文件 %(target)s"
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr "挂载 LXC 块设备"
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr "卸载 LXC 块设备"
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "重新启动实例失败"
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr "重启过程中，实例消失。"
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr "发现 %(migration_count)d 个超过 %(confirm_window)d 秒未经确认的迁移"
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr "正在自动确认迁移 %d"
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr "实例在运行"
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr "virsh 输出： %r"
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr "很酷，这是个设备"
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
-msgstr "无法读取 LXC 控制台"
+#: nova/virt/libvirt/connection.py:967
+#, fuzzy
+msgid "Guest does not have a console available"
+msgstr "用户没有管理员权限"
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr "正在创建镜像"
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr "向镜像 %(img_id)s 注入 %(injection)s"
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr "忽略向镜像 %(img_id)s (%(e)s) 错误注入的数据"
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr "块设备列表 block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr "正在启动 toXML 方法"
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr "toXML方法完成"
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr "查找 %(instance_name)s时libvirt出错：[错误代码 %(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(不支持getVersion)"
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr "'<cpu>' 必须为 1, 但是为 %d\n"
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr "拓扑 (%(topology)s) 必须含有 %(ks)s"
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -5424,7 +5340,7 @@ msgstr ""
 "已启动虚拟机的CPU信息：\n"
 "%s"
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
@@ -5433,7 +5349,7 @@ msgstr ""
 "转换成 xml...\n"
 "：%s "
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5448,37 +5364,42 @@ msgstr ""
 "\n"
 "参考 %(u)s"
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr "迁移 %s 超时"
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "因它像卷，所以跳过 %(path)s"
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr "虚拟机 %s：开始执行 migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 #, fuzzy, python-format
 msgid "During wait running, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 #, fuzzy, python-format
 msgid "Instance running successfully."
 msgstr "虚拟机 %s 成功运行。"
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr "虚拟机 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr "虚拟机 %s：开始执行 finish_revert_migration"
@@ -5497,152 +5418,153 @@ msgstr "在 nwfilter 里调用 setup_basic_filtering"
 msgid "Ensuring static filters"
 msgstr "正在确保静态过滤器"
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr "nwfilter(%(instance_filter_name)s)未找到"
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "名称为 %(name)s 的nwfilter(%(instance_filter_name)s) 未找到。"
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables 防火墙：设置基本的过滤规则"
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "尝试去取消未过滤的虚拟机"
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s 是一个正确的虚拟机名称"
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s 有一个磁盘文件"
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "虚拟机 %(instance)s  由文件 %(backing)s 来备份"
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr "虚拟机 %(instance)s 正在使用的备份文件 %(backing)s 没有出现在镜像服务里。"
 
-#: nova/virt/libvirt/imagecache.py:238
-#, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#: nova/virt/libvirt/imagecache.py:235
+#, fuzzy, python-format
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像验证失败"
 
-#: nova/virt/libvirt/imagecache.py:250
-#, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+#: nova/virt/libvirt/imagecache.py:245
+#, fuzzy, python-format
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像验证跳过，没有散列存储"
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, fuzzy, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "Base 文件太新不需要删除：%s"
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr "正在删除集成文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:303
-#, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#: nova/virt/libvirt/imagecache.py:297
+#, fuzzy, python-format
+msgid "%(id)s (%(base_file)s): checking"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：正在检查中"
 
-#: nova/virt/libvirt/imagecache.py:320
-#, python-format
+#: nova/virt/libvirt/imagecache.py:313
+#, fuzzy, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s)：正在使用中：本地节点 %(local)d, 远程节点 "
 "%(remote)d"
 
-#: nova/virt/libvirt/imagecache.py:333
-#, python-format
+#: nova/virt/libvirt/imagecache.py:325
+#, fuzzy, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s)：警告 -- 使用中缺少基础文件! 虚拟机： "
 "%(instance_list)s"
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, fuzzy, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：在使用中： 在远程节点 (%(remote)d 上"
 
-#: nova/virt/libvirt/imagecache.py:355
-#, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#: nova/virt/libvirt/imagecache.py:343
+#, fuzzy, python-format
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像不在使用中"
 
-#: nova/virt/libvirt/imagecache.py:363
-#, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#: nova/virt/libvirt/imagecache.py:349
+#, fuzzy, python-format
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像在使用中"
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "跳过验证，在 %s 上没有基础目录"
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr "验证基础镜像"
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "未知的基础文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr "激活基础文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "损坏的基础文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr "可删除的基础文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr "确认完成"
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr "无法找到一个开放端口"
 
@@ -5651,29 +5573,29 @@ msgstr "无法找到一个开放端口"
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "保证vlan %(vlan)s 和bridge %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "保证 bridge %s"
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr "去除虚拟机”%s“的虚拟网络设备时失败"
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr "在 %s 未找到iSCSI设备"
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr "在 %(mount_device)s 上还没有找到iSCSI卷。将再次扫描并重试。尝试次数：%(tries)s"
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr "找到iSCSI节点 %(mount_device)s （经过%(tries)s 次再扫描）"
@@ -5792,21 +5714,21 @@ msgstr "获取虚拟机列表"
 msgid "Got total of %s instances"
 msgstr "总共获得 %s 个虚拟机"
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr "无法得到本地的 Datastore 引用"
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr "在ESX主机上创建名为 %s 的虚拟机"
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr "已经在ESX主机上创建名为 %s 的虚拟机"
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
@@ -5815,239 +5737,239 @@ msgstr ""
 "在ESX主机的本地存储 %(data_store_name)s 上创建虚拟磁盘 %(vmdk_file_size_in_kb)s KB "
 "和适配器类型 %(adapter_type)s"
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr "在ESX主机的本地存储 %(data_store_name)s 上创建虚拟磁盘 %(vmdk_file_size_in_kb)s KB"
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr "正在ESX主机的本地存储 %(data_store_name)s 上删除文件 %(flat_uploaded_vmdk_path)s"
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr "已经在ESX主机的本地存储 %(data_store_name)s 上删除文件 %(flat_uploaded_vmdk_path)s"
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr "正在往ESX主机的数据存储 %(data_store_name)s 上下载文件数据 %(image_ref)s"
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr "已经在ESX数据存储 %(data_store_name)s 上下载镜像文件数据 %(image_ref)s"
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr "正在重新配置虚拟机 %s 来挂载镜像磁盘"
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr "已经重新配置虚拟机 %s 来挂载镜像磁盘"
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr "正启动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr "已经启动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr "正在创建虚拟机快照 %s "
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr "已经创建虚拟机快照 %s "
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr "正在快照虚拟机实例 %s 之前复制磁盘数据"
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr "已经在快照虚拟机实例 %s 之前复制磁盘数据"
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr "上传镜像 %s"
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr "已经上传镜像  %s"
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr "正在删除临时的vmdk文件 %s"
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr "已经删除临时的vmdk文件 %s"
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr "虚拟机未启动"
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr "正在重启虚拟机客户操作系统 %s"
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr "已经重启虚拟机客户操作系统 %s"
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr "正在冷启动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr "已经冷启动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr "虚拟机 - %s 不存在"
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr "正在关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr "关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr "正在注销虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr "已经注销虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr "注销虚拟机 %s 时在 vmwareapi:vmops:destroy 中发生异常"
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr "正从数据存储 %(datastore_name)s 中删除虚拟机 %(name)s 的内容"
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr "已经从数据存储 %(datastore_name)s 中删除虚拟机 %(name)s 的内容"
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr "当从磁盘删除虚拟机 %s 的内容时在 vmwareapi:vmops:destroy 里发生异常"
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr "vmwareapi 不支持暂停"
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr "vmwareapi 不支持取消暂停"
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr "挂起虚拟机 %s "
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr "已经挂起虚拟机 %s "
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr "虚拟机已关闭，无法挂起。"
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr "虚拟机 %s 已经在挂起状态。不做任何操作直接返回"
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr "正在恢复虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr "已经恢复虚拟机 %s "
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr "虚拟机不在挂起状态"
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics 没有在 vmwareapi 里实现"
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr "正在重新配置虚拟机 %(name)s 来设置机器的id为ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr "已经重新配置虚拟机 %(name)s 来设置机器的id为ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "正在使用路径 %s 创建目录"
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr "已经创建路径为 %s 的目录"
@@ -6082,27 +6004,27 @@ msgstr "正在获取镜像 %s 的大小"
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "获得镜像 %(image)s 的大小为 %(size)s"
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr "产生 NotImplemented 错误"
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake 没有 %s 的实现"
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "正在调用 %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6116,17 +6038,17 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr "无法为主机得到SR：%s"
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 #, fuzzy, python-format
 msgid "Unable to get updated status"
 msgstr "无法得到最新的状态：%s"
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr "对 %(method)s 的调用返回错误：%(e)s。"
@@ -6156,27 +6078,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, fuzzy, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr "无法找到实例 %s 的宿主机"
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, fuzzy, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr "注入文件失败：%(resp)r"
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "无法使用全局角色 %(role_id)s"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6195,49 +6117,62 @@ msgstr ""
 "网络 %(bridge)s 的 PIF %(pif_rec['uuid'])s  有VLAN id %(pif_vlan)d。期待的数目是 "
 "%(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr "创建虚拟机 %s ..."
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr "已经将虚拟机 %(instance_name)s 创建成 %(vm_ref)s。"
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr "正在为虚拟机 %(vm_ref)s 创建一个特定的CDROM VBD，  VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
+msgstr "没有找到虚拟机 %s 的VBD"
 
-#: nova/virt/xenapi/vm_utils.py:251
-#, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
-msgstr "已经为虚拟机 %(vm_ref)s 创建了一个 基于CDROM 的VBD %(vbd_ref)s，VDI为 %(vdi_ref)s。"
+#: nova/virt/xenapi/vm_utils.py:265
+#, fuzzy, python-format
+msgid "VBD %s already detached"
+msgstr "已经卸载"
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
-msgstr "没有找到虚拟机 %s 的VBD"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
+msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "无法卸除 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "无法销毁 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, fuzzy, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr "为虚拟机 %(vm_ref)s，VDI %(vdi_ref)s创建了VBD %(vbd_ref)s"
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr "为虚拟机 %(vm_ref)s，VDI %(vdi_ref)s创建了VBD %(vbd_ref)s"
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "无法销毁 VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6246,388 +6181,364 @@ msgstr ""
 "创建了 VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)  on"
 " %(sr_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr "在 %(sr_ref)s 上将 VDI %(vdi_to_copy_ref)s 复制成了 VDI %(vdi_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "从 VDI %(vdi_to_clone_ref)s 克隆了 VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr "未找到 %(vm_ref)s 的主VDI"
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr "正在用标签 ”%(label)s“ 为虚拟机 %(vm_ref)s 做快照..."
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr "已经从虚拟机 %(vm_ref)s 里创建了快照 %(template_vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "请求xapi 上传 %(vdi_uuids)s 作为镜像ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr "只能在ext类型的缺省本地SR支持快速克隆。这个系统的SR的类型为 %(sr_type)s。忽略此 cow 标记。"
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr "请求 xapi 获取 vhd 镜像 %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr "xapi 'download_vhd' 返回 UUID 为 “%(vdi_uuid)s” 的 “%(vdi_type)s” 类型的VDI"
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d，allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr "镜像大小 %(size_bytes)d 超过instance_type所允许的小大 %(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr "镜像类型：%s"
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr "ISO：SR可能包含该ISO镜像"
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr "镜像 %(image)s 的大小：%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr "Kernel/Ramdisk镜像太大：%(vdi_size)d bytes，最大 %(max_size)d bytes"
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "将VDI %s 复制到dom0的/boot/guest下"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s已销毁"
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr "实例 %s：获取Glance镜像失败"
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "为镜像 %(image_ref)s 检测到 %(image_type_str)s 格式"
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "为PV内核查询vdi %s"
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "未知的镜像格式 %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s 依然可用"
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr "(VM_UTILS) xenserver 虚拟机状态 -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr "(VM_UTILS) xenapi power_state -> |%s|"
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "重新扫描SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "Flag sr_matching_filter '%s' 没有遵循格式要求"
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr "XenAPI无法找到安装客户实例的Storage Repository。请检查你的配置或者配置flag 'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr "无法找到content-type ISO的SR"
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO：正在查看SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr "ISO：非iso内容"
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO：iso content_type，没有 'i18n-key' 键"
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO：iso content_type，i18n-key的值不是 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: SR符合标准"
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, looking to see if it is host local"
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr "ISO: PBD %(pbd_ref)s 消失了"
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr "ISO：含有本地PBD的SR"
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr "无法为含服务器详细信息的虚拟机 %(vm_uuid)s 获取RRD XML：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr "无法获取包含服务器详细情况的RRD XML更新：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "来自Xenserver无效的统计数据：%s"
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s 有父 %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "父标识 %(parent_uuid)s 和原先的父标识 %(original_parent_uuid)s 不匹配，正在等待合并..."
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr "VHD coalesce 将要超过(%(max_attempts)d)，放弃中..."
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "等待设备 %s 创建超时"
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr "正在为VDI%s创建VBD "
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr "为VDI %s 创建VBD完成。"
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "插入VBD %s... "
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "插入VBD %s 完成。"
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s 作为 %(orig_dev)s 插入"
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s 插入错误的设备，重新映射为 %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "正在销毁VDI为 %s 的 VBD "
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "已经销毁VDI为 %s 的 VBD"
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr "VBD.unplug 操作第一次成功。"
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr "VBD.unplug 操作被拒绝：重试中..."
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr "不再睡眠！"
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr "VBD.unplug 操作最终成功。"
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr "在 VBD.unplug 操作中忽略XenAPI.Failure：%s"
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr "忽略 XenAPI.Failure %s"
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "对 %s 运行pygrub"
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "找到Xen内核 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "没有找到Xen内核。正在启动HVM。"
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr "分区："
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr "将分区表 %(primary_first)d %(primary_last)d 写入到 %(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "书写分区表 %s 完成。"
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr "安装在该镜像的XenServer工具可以进行网络注入。网络文件不会被操作。"
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr "该镜像有XenServer工具，但是不能进行网络注入"
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr "没有在该镜像上安装XenServer工具"
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr "直接操作接口文件"
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "挂载文件系统失败(期望的是非Linux实例)：%s"
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
@@ -6661,248 +6572,248 @@ msgstr "从 dom0 中移除kernel/ramdisk文件"
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr "实例 %(instance_id)s 没有运行。"
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr "正在自动配置虚拟机 %(instance_uuid)s 的磁盘，尝试调整分区大小..."
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr "injected_files无效的值：'%s'"
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr "设置管理员密码"
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr "重置网络"
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr "设置VCPU weight"
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr "启动虚拟机 %s..."
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr "%(hypervisor)s/%(os)s/%(architecture)s 最新的agent build 是 %(version)s 版本"
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "没有找到 %(hypervisor)s/%(os)s/%(architecture)s 的 agent build"
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr "实例 %s：等待运行"
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr "实例 %s：运行"
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr "查询代理版本"
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "实例代理版本：%s"
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr "把代理更新为 %s"
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr "无法为 '%s' 确定opaque_ref。"
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr "快照完毕并为虚拟机 %s 上传"
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr "无法为实例 %(instance_uuid)s 快照：%(exc)s"
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr "将 vhd 转移到新主机失败"
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "将 VDI %(cow_uuid)s 由 %(old_gb)dGB 调小到  %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "将 VDI %(vdi_uuid)s 由 %(old_gb)dGB 调大到  %(new_gb)dGB"
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr "调整实例 %s 的大小完毕"
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr "查询代理版本失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr "domid 由 %(olddomid)s 改变为 %(newdomid)s"
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr "更新代理失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr "交换钥匙失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr "更新密码失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr "注入文件失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr "虚拟机 %(instance_uuid)s 已经终止，跳过关闭..."
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr "无法为虚拟机找到VBD"
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr "正在为实例 %(instance_uuid)s 销毁 VDIs"
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr "实例 %(instance_uuid)s 使用RAW或者VHD，跳过kerne和ramdisk的删除"
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "实例拥有kernel或者ramdisk，但不是二者均有"
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk文件移除了"
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr "实例 %(instance_uuid)s 销毁了"
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr "正在为实例%(instance_uuid)s 销毁虚拟机"
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr "虚拟机不存在，跳过销毁..."
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr "实例已处于Rescue模式：%s"
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "自动冷重启 %d"
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr "没有找到为迁移 %d 的实例，正在跳过"
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr "无法得到带宽信息"
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr "为虚拟机注入网络信息到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr "正在为虚拟机创建 vif(s)：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF  %(vif_ref)s。"
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr "为虚拟机注入hostname到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
@@ -6911,28 +6822,28 @@ msgstr ""
 "%(method)s 的代理调用返回无效的答复：%(ret)r。虚拟机id=%(instance_uuid)s; path=%(path)s; "
 "args=%(addl_args)r"
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr "超时：调用 %(method)s 超时。虚拟机id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr "没有执行：代理不支持 %(method)s 的调用。虚拟机id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr "%(method)s 的调用返回错误：%(e)s。虚拟机id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL错误：%s"
@@ -6965,7 +6876,7 @@ msgid "introducing sr within volume_utils"
 msgstr "在volume_utils里引入sr"
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "将 %(label)s 作为 %(sr_ref)s 引入。"
@@ -6982,7 +6893,7 @@ msgstr "Plugging SR"
 msgid "Unable to introduce Storage Repository"
 msgstr "无法引入Storage Repository"
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr "无法得到使用uuid的SR"
 
@@ -7005,160 +6916,146 @@ msgstr "引入 %s..."
 msgid "Unable to find SR from VBD %s"
 msgstr "无法在VBD %s找到SR"
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr "为虚拟机 %(vm_ref)s ，VDI %(vdi_ref)s 创建VBD... "
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr "为虚拟机 %(vm_ref)s，VDI %(vdi_ref)s创建了VBD %(vbd_ref)s"
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr "为 %(sr_ref)s 得到PBDs时，忽略异常 %(exc)s"
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr "当拔开PBD  %(pbd)s 时，忽略异常 %(exc)s"
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr "无法在SR %s 上引入VDI"
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr "无法使得VDI %s 的记录运行"
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr "无法为SR %s 引入VDI"
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr "在SR %s 寻找VDIs出错"
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr "无法为VDI %s 找到VBD"
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr "无法获得目标信息 %(data)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr "挂载点无法被翻译：%s"
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr "找不到VDI ref"
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr "销毁VDI出错"
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr "正在创建SR %s"
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr "无法创建SR"
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr "无法获取SR记录"
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr "引入SR %s"
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr "在xapi数据库找到SR。无需引入。"
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr "无法引入SR"
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr "检查SR %s"
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr "在xapi数据库没有找到SR %s"
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr "不能忘记SR"
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "无法在SR %(sr_ref)s 上为实例 %(instance_name)s 创建 VDI"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "不能为实例%(instance_name)s使用SR %(sr_ref)s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "无法挂载卷到虚拟机 %s"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 挂载到虚拟机 %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "卸载_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "无法找到 %s 卷"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "无法卸载 %s 卷"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr "无法销毁VBD %s"
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr "净化SR %s 出错"
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 从虚拟机 %(instance_name)s 卸载"
@@ -7198,7 +7095,7 @@ msgstr "意外错误：%s"
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr "启动nova-xvpvncproxy节点(版本 %s)"
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr "状态必须可用"
 
@@ -7207,59 +7104,60 @@ msgstr "状态必须可用"
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr "%(pid)s 的配额超出，尝试创建 %(size)sG 的卷"
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "卷组状态必须可获取"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr "已经加载"
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr "已经卸载"
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr "必须可用"
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr "从失败的执行中恢复。尝试编号 %s"
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr "卷组 %s 不存在"
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr "跳过ensure_export。没有为卷提供iscsi_target：%d"
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr "跳过remove_export。没有为卷提供iscsi_target：%d"
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr "跳过remove_export。没有为卷导出iscsi_target：%d"
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr "采用discovery，ISCSI provider_location 没有存储"
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr "无法为卷 %s 找到 iSCSI 输出"
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr "ISCSI Discovery：找到 %s"
@@ -7293,74 +7191,6 @@ msgstr "Sheepdog 没有工作"
 msgid "LoggingVolumeDriver: %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr "\t卷 %s 不是VSA 卷"
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr "\tFE VSA 卷 %s 的创建 - 什么都不做"
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr "为 %s 的VSA BE create_volume失败"
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr "为 %s 的VSA BE create_volume成功"
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr "\tFE VSA 卷 %s 的删除 - 什么都不做"
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr "为 %s 的VSA BE delete_volume失败"
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr "为 %s 的VSA BE delete_volume成功"
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr "\tFE VSA 卷 %s 本地路径调用 - 调用discover"
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr "不支持local_path"
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr "\tFE VSA Volume %s ensure export - 什么都不做"
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr "\tFE VSA Volume %s create export - 什么都不做"
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr "\tFE VSA Volume %s remove export - 什么都不做"
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr "为 %s 的VSA BE remove_export失败"
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr "获取QoS信息失败"
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7386,83 +7216,83 @@ msgstr "卷%(vol_name)s:创建大小为%(vol_size)s的逻辑卷"
 msgid "volume %s: creating export"
 msgstr "卷%s：正在创建"
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "卷%s：创建成功"
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr "卷仍在挂载中"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr "卷不属于这个节点"
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr "卷%s：移除中"
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr "卷%s：删除中"
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr "卷 %s：卷繁忙"
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "卷%s：删除成功"
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "快照 %s：正在创建"
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "快照 %(snap_name)s：正在创建"
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "快照 %s：创建成功"
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "快照 %s：正在删除"
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "快照 %s：创建成功"
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "快照 %s：删除成功"
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr "检查卷能力"
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr "找到新能力：%s"
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr "清理能力"
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr "收到通知 {%s}"
@@ -7530,102 +7360,106 @@ msgstr "为ip： %s获取元数据失败"
 msgid "Failed to get target IQN for filer: %s"
 msgstr "为ip： %s获取元数据失败"
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr "指定san_password或者san_private_key"
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr "san_ip必须设置"
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "没有为 %(zfs_poolname)s 找到LUID。Output=%(out)s"
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr "返回CLIQ命令 %s"
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr "CLIQ命令 %(verb)s %(cliq_args)s 的不合法答复。Result=%(out)s"
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr "在运行CLIQ命令 %(verb)s %(cliq_args)s 时发生错误。输出结果 Result=%(out)s"
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr "集群 %(cluster_name)s 有过量的虚拟 ip 地址。输出结果 Result=%(_xml)s"
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr "卷信息：%(volume_name)s => %(volume_attributes)s"
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr "不支持local_path"
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr "无法为卷 %s 确定项目，无法导出"
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr "SolidFire API 调用的参数：%s"
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr "调用json.loads()抛出异常：%s"
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr "SolidFire API调用结果：%s"
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr "找到solidfire帐户：%s"
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr "solidfire帐户：%s 不存在，正在创建..."
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr "进入SolidFire create_volume..."
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr "离开SolidFire create_volume"
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr "进入SolidFire delete_volume..."
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr "正在删除volumeID：%s "
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr "离开SolidFire delete_volume"
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr "正在执行SolidFire ensure_export..."
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr "正在执行SolidFire create_export..."
 
@@ -7704,11 +7538,11 @@ msgstr "删除VDI失败"
 msgid "Failed to delete volume in db"
 msgstr "在数据库删除卷失败"
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr "没有在数据库找到卷"
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr "没有在数据库中找到后台(backend)"
 
@@ -7791,144 +7625,243 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr "无效的"
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr "未指定Nova访问参数。"
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr "没有定义drive_name"
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr "无法找到虚拟存储阵列 %(id)d。"
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr "无效的drive类型名称 %s"
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr "无法找到虚拟存储阵列 %(name)s。"
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr "*** 用于实验的VSA代码 ***"
+#~ msgid "No body provided"
+#~ msgstr "没有提供主体"
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr "请求的VCs (%d)数目过大。设置为默认值"
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr "创建类型 %(vc_type)s 的VSA %(display_name)s"
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr "正在创建VSA：%s"
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr "删除id：%s的VSA"
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
-"VSA ID %(vsa_id)d %(vsa_name)s：创建卷 %(vol_name)s，%(vol_size)d GB，类型 "
-"%(vol_type_id)s"
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr "把地址 %(ip)s 与VSA %(id)s关联"
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr "VSA ID %(vsa_id)d：更新VSA状态到 %(status)s"
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr "把地址与VSA %(id)s解除关联"
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr "VSA ID %(vsa_id)d：更新VSA调用"
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr "没有找到ID是 %(id)s 的 %(obj)s"
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr "添加%(add_cnt)s VCs到 %(vsa_name)s。"
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr "ID是 %(id)s 的 %(obj)s 属于VSA %(own_vsa_id)s而不是VSA %(vsa_id)s。"
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr "从VSA %(vsa_name)s 中删除%(del_cnt)s VCs。"
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr "索引。vsa_id=%(vsa_id)s"
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr "VSA ID %(vsa_id)s：删除 %(direction)s 卷 %(vol_name)s"
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr "详细内容。vsa_id=%(vsa_id)s"
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr "无法删除卷 %s"
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr "创建卷。vsa_id=%(vsa_id)s, body=%(body)s"
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr "VSA ID %(vsa_id)s：强迫删除。%(direction)s 卷 %(vol_name)s"
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr "从VSA ID %(vsa_id)s 为创建 %(size)s GB的卷"
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr "将要试图终止VSA ID %s"
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr "更新%(obj)s至id：%(id)s ，修改：%(changes)s"
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr "VSA ID %(vsa_id)s：删除实例 %(name)s"
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr "删除卷。vsa_id=%(vsa_id)s, id=%(id)s"
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr "收到VSA %s 的Create call"
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr "显示卷。vsa_id=%(vsa_id)s, id=%(id)s"
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr "没有找到VSA %(vsa_id)d"
+#~ msgid "Index instances for VSA %s"
+#~ msgstr "为 VSA %s 索引实例"
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr "VSA ID %(vsa_id)s：Drive %(vol_id)s 创建。状态 %(status)s"
+#~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr "准备强制删除虚拟机 %(instance_uuid)s，即使已经删除了。"
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr "Drive %(vol_name)s (%(vol_disp_name)s) 依然在创建阶段 - 请等待"
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr "数据库中不存在虚拟机 %(instance_uuid)s，但是无论如何要用特殊上下文来关闭。"
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr "尝试销毁已经销毁的实例: %s"
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr "VSA ID %(vsa_id)d：Drive %(vol_name)s (%(vol_disp_name)s)处于 %(status)s 状态。"
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr "SQL连接失败 (%(connstring)s)。还剩 %(attempts)d 次。"
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr "更新卷 %(vol_name)s 的挂载状态失败。%(ex)s"
+#~ msgid "Can't downgrade without losing data"
+#~ msgstr "无法不丢失数据地降级"
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr "VSA ID %(vsa_id)d：删除所有BE卷"
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr "没有找到实例 %(instance_id)s"
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr "VSA ID %(vsa_id)d：启动 %(vc_count)d 个实例"
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr "_filter_hosts: %(request_spec)s"
 
-#~ msgid "Can't downgrade without losing data"
-#~ msgstr "无法不丢失数据地降级"
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr "按照驱动类型 %s 过滤主机"
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr "主机 %s 没有足够的能力。跳过"
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr "过滤主机：%s"
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr "必须实现主机选择机制"
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr "所选择主机的最大数目(%d)"
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr "选择超过了主机 %(host)s"
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr "在主机 %(host)s 提供大小为 %(size)s GB 的卷 %(name)s"
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr "volume_params %(volume_params)s"
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr "%(i)d：卷名%(name)s"
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr "正在尝试创建 %(num_volumes)d 个卷"
+
+#~ msgid "Error creating volumes"
+#~ msgstr "创建卷失败"
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr "Non-VSA 卷 %d"
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr "正在创建驱动类型为%(drive_type)s 的卷 %(volume_id)s"
+
+#~ msgid "Error creating volume"
+#~ msgstr "创建卷失败"
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr "没有能力分配大小为 %(size)s 的卷"
+
+#~ msgid "Host %s:"
+#~ msgstr "主机 %s："
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+#~ "\t驱动 %(qosgrp)-25s：总共 %(total)2s，已用 %(used)2s，"
+#~ " 空闲 %(free)2s。可用 %(avail)-5s"
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr "\t [ tab] LeastUsedHost：最佳主机： %(best_host)s。(使用的空间 %(min_used)s)"
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr "\t MostAvailCap：最佳主机： %(best_host)s。 (可用 %(max_avail)s %(type_str)s)"
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr "测试：模拟错误的 VSA 名称。抛出异常"
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr "测试：Emulate DB error。抛出"
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr "测试：user_data = %s"
+
+#~ msgid "_create: param=%s"
+#~ msgstr "_create: param=%s"
+
+#~ msgid "Host %s"
+#~ msgstr "主机 %s"
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr "测试：在主机 %(host)s 上提供 %(name)s"
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr "\t vol=%(vol)s"
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr "测试：VSA更新请求：vsa_id=%(vsa_id)s values=%(values)s"
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr "测试：卷创建：%s"
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr "测试：卷获取请求：id=%(volume_id)s"
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr "测试：卷获取请求：id=%(volume_id)s values=%(values)s"
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr "测试：卷获取：id=%(volume_id)s"
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr "任务 [%(name)s] %(task)s 状态：成功 %(result)s"
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr "任务 [%(name)s] %(task)s 状态：%(status)s %(error_info)s"
+
+#~ msgid "virsh said: %r"
+#~ msgstr "virsh 输出： %r"
+
+#~ msgid "cool, it's a device"
+#~ msgstr "很酷，这是个设备"
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr "无法读取 LXC 控制台"
 
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr "nwfilter(%(instance_secgroup_filter_name)s) 未找到"
 
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "正在为虚拟机 %(vm_ref)s 创建一个特定的CDROM VBD，  VDI %(vdi_ref)s ... "
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr "已经为虚拟机 %(vm_ref)s 创建了一个 基于CDROM 的VBD %(vbd_ref)s，VDI为 %(vdi_ref)s。"
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr "正在为VDI%s创建VBD "
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr "为VDI %s 创建VBD完成。"
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr "VBD.unplug 操作第一次成功。"
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr "VBD.unplug 操作被拒绝：重试中..."
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr "不再睡眠！"
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr "VBD.unplug 操作最终成功。"
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr "在 VBD.unplug 操作中忽略XenAPI.Failure：%s"
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr "忽略 XenAPI.Failure %s"
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr "实例 %s：生产失败"
 
@@ -7941,3 +7874,133 @@ msgstr "VSA ID %(vsa_id)d：启动 %(vc_count)d 个实例"
 #~ msgid "Resources to remove:%s"
 #~ msgstr "将要移除的资源：%s"
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr "为虚拟机 %(vm_ref)s ，VDI %(vdi_ref)s 创建VBD... "
+
+#~ msgid "Error destroying VDI"
+#~ msgstr "销毁VDI出错"
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr "\t卷 %s 不是VSA 卷"
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr "\tFE VSA 卷 %s 的创建 - 什么都不做"
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr "为 %s 的VSA BE create_volume失败"
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr "为 %s 的VSA BE create_volume成功"
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr "\tFE VSA 卷 %s 的删除 - 什么都不做"
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr "为 %s 的VSA BE delete_volume失败"
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr "为 %s 的VSA BE delete_volume成功"
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr "\tFE VSA 卷 %s 本地路径调用 - 调用discover"
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr "\tFE VSA Volume %s ensure export - 什么都不做"
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr "\tFE VSA Volume %s create export - 什么都不做"
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr "\tFE VSA Volume %s remove export - 什么都不做"
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr "为 %s 的VSA BE remove_export失败"
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr "获取QoS信息失败"
+
+#~ msgid "drive_name not defined"
+#~ msgstr "没有定义drive_name"
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr "无效的drive类型名称 %s"
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr "*** 用于实验的VSA代码 ***"
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr "请求的VCs (%d)数目过大。设置为默认值"
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr "正在创建VSA：%s"
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s：创建卷 "
+#~ "%(vol_name)s，%(vol_size)d GB，类型 %(vol_type_id)s"
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr "VSA ID %(vsa_id)d：更新VSA状态到 %(status)s"
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr "VSA ID %(vsa_id)d：更新VSA调用"
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr "添加%(add_cnt)s VCs到 %(vsa_name)s。"
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr "从VSA %(vsa_name)s 中删除%(del_cnt)s VCs。"
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr "VSA ID %(vsa_id)s：删除 %(direction)s 卷 %(vol_name)s"
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr "无法删除卷 %s"
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr "VSA ID %(vsa_id)s：强迫删除。%(direction)s 卷 %(vol_name)s"
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr "将要试图终止VSA ID %s"
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr "VSA ID %(vsa_id)s：删除实例 %(name)s"
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr "收到VSA %s 的Create call"
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr "没有找到VSA %(vsa_id)d"
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr "VSA ID %(vsa_id)s：Drive %(vol_id)s 创建。状态 %(status)s"
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr "Drive %(vol_name)s (%(vol_disp_name)s) 依然在创建阶段 - 请等待"
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+#~ "VSA ID %(vsa_id)d：Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s)处于 %(status)s 状态。"
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr "更新卷 %(vol_name)s 的挂载状态失败。%(ex)s"
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr "VSA ID %(vsa_id)d：删除所有BE卷"
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr "VSA ID %(vsa_id)d：启动 %(vc_count)d 个实例"
+
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index b42aea4a9..0647bd462 100644
--- a/nova/locale/zh_TW/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_TW/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-03-04 23:01+0000\n"
-"PO-Revision-Date: 2011-10-21 09:12+0000\n"
-"Last-Translator: Tom Fifield <Unknown>\n"
+"POT-Creation-Date: 2012-03-22 16:23+0000\n"
+"PO-Revision-Date: 2012-03-07 02:00+0000\n"
+"Last-Translator: Charles Hsu <charles0126+openstack@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: nova/context.py:52
+#: nova/context.py:59
+#, python-format
+msgid "Arguments dropped when creating context: %s"
+msgstr ""
+
+#: nova/context.py:90
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
@@ -86,11 +91,11 @@ msgstr ""
 
 #: nova/exception.py:155
 msgid "An unknown exception occurred."
-msgstr ""
+msgstr "發生一個未知例外"
 
 #: nova/exception.py:178
 msgid "Failed to decrypt text"
-msgstr ""
+msgstr "內文解碼失敗"
 
 #: nova/exception.py:182
 msgid "Failed to paginate through images from image service"
@@ -98,15 +103,15 @@ msgstr ""
 
 #: nova/exception.py:186
 msgid "Virtual Interface creation failed"
-msgstr ""
+msgstr "建立虛擬介面失敗"
 
 #: nova/exception.py:190
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
-msgstr ""
+msgstr "連續嘗試 5 次建立唯一網路位置(MAC)的虛擬介面失敗"
 
 #: nova/exception.py:195
 msgid "Connection to glance failed"
-msgstr ""
+msgstr "連接到glance失敗"
 
 #: nova/exception.py:199
 msgid "Connection to melange failed"
@@ -114,11 +119,11 @@ msgstr ""
 
 #: nova/exception.py:203
 msgid "Not authorized."
-msgstr ""
+msgstr "未被授權"
 
 #: nova/exception.py:208
 msgid "User does not have admin privileges"
-msgstr ""
+msgstr "使用者並沒有管理者權力"
 
 #: nova/exception.py:212
 #, python-format
@@ -126,198 +131,207 @@ msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
 #: nova/exception.py:216
-msgid "Unacceptable parameters."
+#, python-format
+msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:221
-msgid "Invalid snapshot"
-msgstr ""
+#: nova/exception.py:220
+msgid "Unacceptable parameters."
+msgstr "不可接受的參數值"
 
 #: nova/exception.py:225
+msgid "Invalid snapshot"
+msgstr "無效的快照(snapshot)"
+
+#: nova/exception.py:229
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:229 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:233 nova/api/openstack/compute/contrib/keypairs.py:113
 msgid "Keypair data is invalid"
-msgstr ""
+msgstr "無效的Keypair"
 
-#: nova/exception.py:233
+#: nova/exception.py:237
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:237
+#: nova/exception.py:241
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:245
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:249
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:253
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:257
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:261
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:265
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:269
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:273
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:277
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:281
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:285
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:292
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:292
+#: nova/exception.py:296
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:301
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:301
+#: nova/exception.py:305
 #, 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:306
+#: nova/exception.py:310
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:314
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:314
+#: nova/exception.py:318
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:322
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:326
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:330
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:334
+msgid "Failed to terminate instance"
+msgstr ""
+
+#: nova/exception.py:338
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:342
 msgid "Volume service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:346
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:350
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:355
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:359
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:363
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:367
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:364
+#: nova/exception.py:372
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:369
+#: nova/exception.py:377
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:373
+#: nova/exception.py:381
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:377
+#: nova/exception.py:385
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:389
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:393
 #, 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:391
+#: nova/exception.py:399
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -325,618 +339,609 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:398
+#: nova/exception.py:406
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:402
+#: nova/exception.py:410
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:406
+#: nova/exception.py:414
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:418
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:422
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:419
+#: nova/exception.py:427
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:423
+#: nova/exception.py:431
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:427
+#: nova/exception.py:435
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:440
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:444
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:449
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:445
+#: nova/exception.py:453
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:449
+#: nova/exception.py:457
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:454
+#: nova/exception.py:462
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:467
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:471
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:475
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:472
+#: nova/exception.py:480
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:476
+#: nova/exception.py:484
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:480
+#: nova/exception.py:488
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:492
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:496
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:493
+#: nova/exception.py:501
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:505
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:509
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:513
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:517
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:521
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:525
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:529
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:533
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:537
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:541
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:545
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:549
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:553
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:557
 #, 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:554
+#: nova/exception.py:562
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:566
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:570
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:574
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:578
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:582
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:586
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:595
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:591
+#: nova/exception.py:599
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:596
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:600
+#: nova/exception.py:608
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:604
+#: nova/exception.py:612
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:608
+#: nova/exception.py:616
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:620
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:624
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:628
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:636
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:640
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:644
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:648
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:652
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:656
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:660
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:664
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:668
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:672
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:676
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:680
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:684
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:688
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:692
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:696
+#, python-format
+msgid "Quota class %(class_name)s could not be found."
+msgstr ""
+
+#: nova/exception.py:700
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:704
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:709
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:701
+#: nova/exception.py:713
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:718
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:723
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:727
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:720
+#: nova/exception.py:732
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:724
+#: nova/exception.py:736
 #, 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:730
+#: nova/exception.py:742
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:746
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:738
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:755
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:747
+#: nova/exception.py:759
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:751
+#: nova/exception.py:763
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:755
+#: nova/exception.py:767
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:760
+#: nova/exception.py:772
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:764
+#: nova/exception.py:776
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:768
+#: nova/exception.py:780
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:772
+#: nova/exception.py:784
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:781
+#: nova/exception.py:793
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:798
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:791
+#: nova/exception.py:803
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:807
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:811
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:815
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:819
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:823
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:827
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:832
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:836
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:840
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:844
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:848
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:852
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:861
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:865
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:869
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:873
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:865
+#: nova/exception.py:877
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:870
+#: nova/exception.py:882
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:874
+#: nova/exception.py:886
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:878
+#: nova/exception.py:890
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:882
+#: nova/exception.py:894
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:886
+#: nova/exception.py:898
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:902
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:906
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:898
-#, python-format
-msgid "Could not find config at %(path)s"
-msgstr ""
-
-#: nova/exception.py:902
-#, python-format
-msgid "Could not load paste app '%(name)s' from %(path)s"
-msgstr ""
-
-#: nova/exception.py:906
-msgid "Nova access parameters were not specified."
-msgstr ""
-
 #: nova/exception.py:910
 #, python-format
-msgid "Virtual Storage Array %(id)d could not be found."
+msgid "Could not find config at %(path)s"
 msgstr ""
 
 #: nova/exception.py:914
 #, python-format
-msgid "Virtual Storage Array %(name)s could not be found."
+msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
 #: nova/exception.py:918
@@ -1062,6 +1067,11 @@ msgstr ""
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
+#: nova/exception.py:1025
+#, python-format
+msgid "Could not fetch image %(image)s"
+msgstr ""
+
 #: nova/log.py:310
 #, python-format
 msgid "syslog facility must be one of: %s"
@@ -1094,193 +1104,197 @@ msgstr ""
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:159
+#: nova/service.py:131
+msgid "SIGTERM received"
+msgstr ""
+
+#: nova/service.py:169
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:187
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:251
+#: nova/service.py:261
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:288
+#: nova/service.py:298
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:303
+#: nova/service.py:313
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:309
+#: nova/service.py:319
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:402
+#: nova/service.py:412
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:409
+#: nova/service.py:419
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:76
+#: nova/utils.py:78
 #, python-format
 msgid "Inner Exception: %s"
 msgstr ""
 
-#: nova/utils.py:160
+#: nova/utils.py:164
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:203
+#: nova/utils.py:209
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:213
+#: nova/utils.py:219
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:229 nova/utils.py:308
+#: nova/utils.py:235 nova/utils.py:314
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:242
+#: nova/utils.py:248
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:284
+#: nova/utils.py:290
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:286
+#: nova/utils.py:292
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:290
+#: nova/utils.py:296
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:349
+#: nova/utils.py:351
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:482
+#: nova/utils.py:533
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:485
+#: nova/utils.py:536
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:596
+#: nova/utils.py:647
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:607
+#: nova/utils.py:658
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:656
+#: nova/utils.py:707
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:832
+#: nova/utils.py:925
 #, python-format
-msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:836
+#: nova/utils.py:929
 #, python-format
-msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:840
+#: nova/utils.py:933
 #, python-format
-msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:847
+#: nova/utils.py:940
 #, python-format
-msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:906
+#: nova/utils.py:999
 #, python-format
-msgid "Found sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:913
+#: nova/utils.py:1006
 #, python-format
-msgid "Cleaned sentinel %(filename)s for pid %(pid)sfilename"
+msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:928
+#: nova/utils.py:1021
 #, python-format
-msgid "Found lockfile %(file)s with link count %(count)dfile"
+msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:933
+#: nova/utils.py:1026
 #, python-format
-msgid "Cleaned lockfile %(file)s with link count %(count)dfile"
+msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1043
+#: nova/utils.py:1136
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1074
+#: nova/utils.py:1167
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1199
+#: nova/utils.py:1296
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1231
+#: nova/utils.py:1328
 msgid "Original exception being dropped"
 msgstr ""
 
-#: nova/utils.py:1350
+#: nova/utils.py:1447
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1352
+#: nova/utils.py:1449
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1384
+#: nova/utils.py:1481
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1386
+#: nova/utils.py:1483
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1564
+#: nova/utils.py:1667
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -1320,6 +1334,11 @@ msgstr ""
 msgid "Returned non-serializeable type: %s"
 msgstr ""
 
+#: nova/api/validator.py:142
+#, python-format
+msgid "%(key)s with value %(value)s failed validator  %(validator)s"
+msgstr ""
+
 #: nova/api/ec2/__init__.py:73
 #, python-format
 msgid "%(code)s: %(message)s"
@@ -1353,97 +1372,97 @@ msgstr ""
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:389
+#: nova/api/ec2/__init__.py:388
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:405
+#: nova/api/ec2/__init__.py:404
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:436
+#: nova/api/ec2/__init__.py:435
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:438
+#: nova/api/ec2/__init__.py:437
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:513
+#: nova/api/ec2/__init__.py:512
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:585
+#: nova/api/ec2/__init__.py:584
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:591
+#: nova/api/ec2/__init__.py:590
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:597
+#: nova/api/ec2/__init__.py:596
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:603
+#: nova/api/ec2/__init__.py:602
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:606
+#: nova/api/ec2/__init__.py:605
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:614
+#: nova/api/ec2/__init__.py:613
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:618
+#: nova/api/ec2/__init__.py:617
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:622
+#: nova/api/ec2/__init__.py:621
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:626
+#: nova/api/ec2/__init__.py:625
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:630
+#: nova/api/ec2/__init__.py:629
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:634
+#: nova/api/ec2/__init__.py:633
 #, python-format
 msgid "ValidatorError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:645
+#: nova/api/ec2/__init__.py:644
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:645
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:648 nova/api/metadata/handler.py:250
+#: nova/api/ec2/__init__.py:647 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1457,170 +1476,230 @@ msgstr ""
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:373
+#, python-format
+msgid ""
+"Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
+"character, spaces, dashes, and underscore."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:379
+#, python-format
+msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:383
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:381
+#: nova/api/ec2/cloud.py:392
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:399
+#: nova/api/ec2/cloud.py:410
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:541
+#: nova/api/ec2/cloud.py:552
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:659 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:637 nova/api/ec2/cloud.py:691
+#: nova/api/ec2/cloud.py:798
+msgid "Not enough parameters, need group_name or group_id"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:652
+#: nova/api/openstack/compute/contrib/security_groups.py:518
+#, python-format
+msgid "Revoke security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:717
+#, python-format
+msgid "%s Not enough parameters to build a valid rule"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:682 nova/api/ec2/cloud.py:742
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:744
+#: nova/api/ec2/cloud.py:706
+#: nova/api/openstack/compute/contrib/security_groups.py:354
+#, python-format
+msgid "Authorize security group ingress %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:723
+#, python-format
+msgid "%s - This rule already exists in group"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:767
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:774
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:755
+#: nova/api/ec2/cloud.py:778
 #: nova/api/openstack/compute/contrib/security_groups.py:292
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:758
+#: nova/api/ec2/cloud.py:781
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:813
 #: nova/api/openstack/compute/contrib/security_groups.py:245
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:798 nova/compute/manager.py:1612
+#: nova/api/ec2/cloud.py:821 nova/compute/manager.py:1629
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:869
+#: nova/api/ec2/cloud.py:892
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:873 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/ec2/cloud.py:896 nova/api/openstack/compute/contrib/volumes.py:186
 #: nova/api/openstack/volume/volumes.py:222
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:901
+#: nova/api/ec2/cloud.py:919
+msgid "Delete Failed"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:929
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:916 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:937
+msgid "Attach Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:950 nova/api/openstack/compute/contrib/volumes.py:366
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:943 nova/api/ec2/cloud.py:1000
-#: nova/api/ec2/cloud.py:1470 nova/api/ec2/cloud.py:1485
+#: nova/api/ec2/cloud.py:957
+msgid "Detach Volume Failed."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:982 nova/api/ec2/cloud.py:1039
+#: nova/api/ec2/cloud.py:1516 nova/api/ec2/cloud.py:1531
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1066
+#: nova/api/ec2/cloud.py:1105
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1214
+#: nova/api/ec2/cloud.py:1253
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1226
+#: nova/api/ec2/cloud.py:1265
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1231
+#: nova/api/ec2/cloud.py:1270
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1241
+#: nova/api/ec2/cloud.py:1280
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1306
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1287
+#: nova/api/ec2/cloud.py:1327
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1301
+#: nova/api/ec2/cloud.py:1341
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1352
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1323
+#: nova/api/ec2/cloud.py:1363
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1415
+#: nova/api/ec2/cloud.py:1453
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1442
+#: nova/api/ec2/cloud.py:1469
+msgid "imageLocation is required"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1488
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1488
+#: nova/api/ec2/cloud.py:1534
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1490
+#: nova/api/ec2/cloud.py:1536
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1492
+#: nova/api/ec2/cloud.py:1538
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1540
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1551
+#: nova/api/ec2/cloud.py:1553
+#, python-format
+msgid "Not allowed to modify attributes for image %s"
+msgstr ""
+
+#: nova/api/ec2/cloud.py:1601
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/metadata/handler.py:248 nova/api/metadata/handler.py:255
+#: nova/api/metadata/handler.py:246 nova/api/metadata/handler.py:253
 #, python-format
 msgid "Failed to get metadata for ip: %s"
 msgstr ""
@@ -1689,36 +1768,46 @@ msgstr ""
 msgid "Provided API key is valid, but not for user '%(username)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:168
+#: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:172
+#: nova/api/openstack/common.py:136 nova/api/openstack/common.py:171
 msgid "limit param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:162
+#: nova/api/openstack/common.py:161
 msgid "offset param must be an integer"
 msgstr ""
 
-#: nova/api/openstack/common.py:176
+#: nova/api/openstack/common.py:175
 msgid "offset param must be positive"
 msgstr ""
 
-#: nova/api/openstack/common.py:200
+#: nova/api/openstack/common.py:199
 #, python-format
 msgid "marker [%s] not found"
 msgstr ""
 
-#: nova/api/openstack/common.py:240
+#: nova/api/openstack/common.py:239
 #, python-format
 msgid "href %s does not contain version"
 msgstr ""
 
-#: nova/api/openstack/common.py:275
+#: nova/api/openstack/common.py:274
 msgid "Image metadata limit exceeded"
 msgstr ""
 
+#: nova/api/openstack/common.py:291
+#, python-format
+msgid "Converting nw_info: %s"
+msgstr ""
+
+#: nova/api/openstack/common.py:301
+#, python-format
+msgid "Converted networks: %s"
+msgstr ""
+
 #: nova/api/openstack/common.py:334
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
@@ -1787,12 +1876,12 @@ msgstr ""
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:342
+#: nova/api/openstack/extensions.py:344
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:366
+#: nova/api/openstack/extensions.py:368
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1848,7 +1937,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:101
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
-#: nova/api/openstack/compute/contrib/console_output.py:51
+#: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
 msgstr ""
 
@@ -1865,20 +1954,20 @@ msgstr ""
 msgid "%(url)s returned a fault: %(e)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:264
+#: nova/api/openstack/xmlutil.py:265
 msgid "element is not a child"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:413
+#: nova/api/openstack/xmlutil.py:414
 msgid "root element selecting a list"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:738
+#: nova/api/openstack/xmlutil.py:739
 #, python-format
 msgid "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)s"
 msgstr ""
 
-#: nova/api/openstack/xmlutil.py:857
+#: nova/api/openstack/xmlutil.py:858
 msgid "subclasses must implement construct()!"
 msgstr ""
 
@@ -1888,8 +1977,8 @@ msgid "Initializing extension manager."
 msgstr ""
 
 #: nova/api/openstack/compute/image_metadata.py:40
-#: nova/api/openstack/compute/images.py:141
-#: nova/api/openstack/compute/images.py:156
+#: nova/api/openstack/compute/images.py:146
+#: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
@@ -1966,179 +2055,182 @@ msgstr ""
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:500
+#: nova/api/openstack/compute/servers.py:501
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:504
+#: nova/api/openstack/compute/servers.py:505
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:523
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:525
+#: nova/api/openstack/compute/servers.py:526
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:530
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:545
+#: nova/api/openstack/compute/servers.py:546
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:554
+#: nova/api/openstack/compute/servers.py:555
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:561
+#: nova/api/openstack/compute/servers.py:562
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:567
+#: nova/api/openstack/compute/servers.py:568
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:570
+#: nova/api/openstack/compute/servers.py:571
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:582
+#: nova/api/openstack/compute/servers.py:583
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:589
-#: nova/api/openstack/compute/servers.py:596
+#: nova/api/openstack/compute/servers.py:590
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:628
-msgid "Server name is not defined"
+#: nova/api/openstack/compute/servers.py:597
+msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:642
-msgid "Invalid imageRef provided."
+#: nova/api/openstack/compute/servers.py:629
+msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
-#: nova/api/openstack/compute/servers.py:742
+#: nova/api/openstack/compute/servers.py:671
+#: nova/api/openstack/compute/servers.py:736
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:739
+#: nova/api/openstack/compute/servers.py:733
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:745
+#: nova/api/openstack/compute/servers.py:739
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:831
-#: nova/api/openstack/compute/servers.py:851
+#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:845
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:837
+#: nova/api/openstack/compute/servers.py:831
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:857
+#: nova/api/openstack/compute/servers.py:851
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:870
+#: nova/api/openstack/compute/servers.py:864
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:874
+#: nova/api/openstack/compute/servers.py:868
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:881
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:899
+#: nova/api/openstack/compute/servers.py:893
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:902
+#: nova/api/openstack/compute/servers.py:896
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:926
+#: nova/api/openstack/compute/servers.py:920
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:933
+#: nova/api/openstack/compute/servers.py:927
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:940
+#: nova/api/openstack/compute/servers.py:936
+msgid "Invalid imageRef provided."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:945
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:953
+#: nova/api/openstack/compute/servers.py:958
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:957
-#: nova/api/openstack/compute/servers.py:1133
+#: nova/api/openstack/compute/servers.py:962
+#: nova/api/openstack/compute/servers.py:1140
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:971
+#: nova/api/openstack/compute/servers.py:976
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:984
+#: nova/api/openstack/compute/servers.py:989
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:987
+#: nova/api/openstack/compute/servers.py:992
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1005
-#: nova/api/openstack/compute/contrib/aggregates.py:143
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:65
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1015
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1060
+#: nova/api/openstack/compute/servers.py:1067
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1063
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1092
+#: nova/api/openstack/compute/servers.py:1099
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1101
+#: nova/api/openstack/compute/servers.py:1108
 #: nova/api/openstack/compute/contrib/admin_actions.py:238
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1156
+#: nova/api/openstack/compute/servers.py:1163
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2177,7 +2269,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:170
 #: nova/api/openstack/compute/contrib/admin_actions.py:186
 #: nova/api/openstack/compute/contrib/multinic.py:41
-#: nova/api/openstack/compute/contrib/rescue.py:43
+#: nova/api/openstack/compute/contrib/rescue.py:44
 msgid "Server not found"
 msgstr ""
 
@@ -2210,8 +2302,8 @@ msgid "createBackup attribute 'rotation' must be an integer"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:244
-#: nova/api/openstack/compute/contrib/console_output.py:46
-#: nova/api/openstack/compute/contrib/console_output.py:58
+#: nova/api/openstack/compute/contrib/console_output.py:47
+#: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
 #: nova/api/openstack/compute/contrib/server_action_list.py:49
@@ -2229,46 +2321,46 @@ msgstr ""
 msgid "Live migration of instance %(id)s to host %(host)s failed"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:77
+#: nova/api/openstack/compute/contrib/aggregates.py:76
 #, python-format
 msgid ""
 "Cannot create aggregate with name %(name)s and availability zone "
 "%(avail_zone)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:89
+#: nova/api/openstack/compute/contrib/aggregates.py:88
 #, python-format
 msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:115
+#: nova/api/openstack/compute/contrib/aggregates.py:114
 #, python-format
 msgid "Cannot update aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:127
+#: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
 msgid "Cannot delete aggregate: %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:140
+#: nova/api/openstack/compute/contrib/aggregates.py:139
 #, python-format
 msgid "Aggregates does not have %s action"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:153
-#: nova/api/openstack/compute/contrib/aggregates.py:159
+#: nova/api/openstack/compute/contrib/aggregates.py:152
+#: nova/api/openstack/compute/contrib/aggregates.py:158
 #, python-format
 msgid "Cannot add host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:172
-#: nova/api/openstack/compute/contrib/aggregates.py:176
+#: nova/api/openstack/compute/contrib/aggregates.py:171
+#: nova/api/openstack/compute/contrib/aggregates.py:175
 #, python-format
 msgid "Cannot remove host %(host)s in aggregate %(id)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/aggregates.py:196
+#: nova/api/openstack/compute/contrib/aggregates.py:195
 #, python-format
 msgid "Cannot set metadata %(metadata)s in aggregate %(id)s"
 msgstr ""
@@ -2301,8 +2393,8 @@ msgstr ""
 msgid "Server not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavorextradata.py:60
-#: nova/api/openstack/compute/contrib/flavorextradata.py:90
+#: nova/api/openstack/compute/contrib/flavorextradata.py:61
+#: nova/api/openstack/compute/contrib/flavorextradata.py:91
 msgid "Flavor not found."
 msgstr ""
 
@@ -2322,8 +2414,8 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:201
 #: nova/api/openstack/compute/contrib/floating_ips.py:230
-#: nova/api/openstack/compute/contrib/security_groups.py:560
-#: nova/api/openstack/compute/contrib/security_groups.py:593
+#: nova/api/openstack/compute/contrib/security_groups.py:572
+#: nova/api/openstack/compute/contrib/security_groups.py:605
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -2365,11 +2457,11 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:228
+#: nova/api/openstack/compute/contrib/hosts.py:230
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:236
+#: nova/api/openstack/compute/contrib/hosts.py:238
 msgid "Host not found"
 msgstr ""
 
@@ -2466,11 +2558,6 @@ msgstr ""
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:354
-#, python-format
-msgid "Authorize security group ingress %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/security_groups.py:369
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
@@ -2488,27 +2575,22 @@ msgstr ""
 msgid "Parent group id and group id cannot be same"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:496
+#: nova/api/openstack/compute/contrib/security_groups.py:508
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:499
+#: nova/api/openstack/compute/contrib/security_groups.py:511
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:506
-#, python-format
-msgid "Revoke security group ingress %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/security_groups.py:563
-#: nova/api/openstack/compute/contrib/security_groups.py:596
+#: nova/api/openstack/compute/contrib/security_groups.py:575
+#: nova/api/openstack/compute/contrib/security_groups.py:608
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:567
-#: nova/api/openstack/compute/contrib/security_groups.py:600
+#: nova/api/openstack/compute/contrib/security_groups.py:579
+#: nova/api/openstack/compute/contrib/security_groups.py:612
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -2522,82 +2604,6 @@ msgstr ""
 msgid "stop instance %r"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:170
-msgid "No body provided"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:182
-#, python-format
-msgid "Create VSA %(display_name)s of type %(vc_type)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:203
-#, python-format
-msgid "Delete VSA with id: %s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:224
-#, python-format
-msgid "Associate address %(ip)s to VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:253
-#, python-format
-msgid "Disassociate address from VSA %(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:293
-#, python-format
-msgid "%(obj)s with ID %(id)s not found"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:299
-#, python-format
-msgid ""
-"%(obj)s with ID %(id)s belongs to VSA %(own_vsa_id)s and not to VSA "
-"%(vsa_id)s."
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:319
-#, python-format
-msgid "Index. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:324
-#, python-format
-msgid "Detail. vsa_id=%(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:329
-#, python-format
-msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:338
-#, python-format
-msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:383
-#, python-format
-msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:398
-#, python-format
-msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:414
-#, python-format
-msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
-msgstr ""
-
-#: nova/api/openstack/compute/contrib/virtual_storage_arrays.py:625
-#, python-format
-msgid "Index instances for VSA %s"
-msgstr ""
-
 #: nova/api/openstack/compute/contrib/volumes.py:73
 #: nova/api/openstack/volume/volumes.py:106
 #, python-format
@@ -2621,7 +2627,7 @@ msgstr ""
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:523
+#: nova/api/openstack/compute/contrib/volumes.py:524
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
@@ -2638,133 +2644,133 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:295
+#: nova/auth/manager.py:298
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:299
+#: nova/auth/manager.py:302
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:305
+#: nova/auth/manager.py:308
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:312
+#: nova/auth/manager.py:315
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:321
+#: nova/auth/manager.py:324
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:328 nova/auth/manager.py:340
+#: nova/auth/manager.py:331 nova/auth/manager.py:343
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:329 nova/auth/manager.py:341
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:330 nova/auth/manager.py:342
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:354
+#: nova/auth/manager.py:335 nova/auth/manager.py:357
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:350
+#: nova/auth/manager.py:353
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:446
+#: nova/auth/manager.py:449
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:487
+#: nova/auth/manager.py:490
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:493
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:516
+#: nova/auth/manager.py:519
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:522
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:592
+#: nova/auth/manager.py:595
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:610
+#: nova/auth/manager.py:613
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:622
+#: nova/auth/manager.py:625
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:643
+#: nova/auth/manager.py:646
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:673
+#: nova/auth/manager.py:676
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:731
+#: nova/auth/manager.py:734
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:740
+#: nova/auth/manager.py:743
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:750
+#: nova/auth/manager.py:753
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:752
+#: nova/auth/manager.py:755
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:754
+#: nova/auth/manager.py:757
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:799
+#: nova/auth/manager.py:802
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
@@ -2790,117 +2796,122 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:149
+#: nova/compute/api.py:141
+msgid "No compute host specified"
+msgstr ""
+
+#: nova/compute/api.py:144
+#, python-format
+msgid "Unable to find host for Instance %s"
+msgstr ""
+
+#: nova/compute/api.py:192
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:160
+#: nova/compute/api.py:203
 #, python-format
 msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
 msgstr ""
 
-#: nova/compute/api.py:213
-#, python-format
-msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
+#: nova/compute/api.py:257
+msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:216
-msgid "Instance quota exceeded. You cannot run any more instances of this type."
+#: nova/compute/api.py:259
+#, python-format
+msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:219
+#: nova/compute/api.py:261
 #, python-format
-msgid "Instance quota exceeded. You can only run %s more instances of this type."
+msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. "
 msgstr ""
 
-#: nova/compute/api.py:268
+#: nova/compute/api.py:310
 msgid "Creating a raw instance"
 msgstr ""
 
-#: nova/compute/api.py:270
+#: nova/compute/api.py:312
 #, python-format
 msgid "Using Kernel=%(kernel_id)s, Ramdisk=%(ramdisk_id)s"
 msgstr ""
 
-#: nova/compute/api.py:341
+#: nova/compute/api.py:383
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:405
+#: nova/compute/api.py:447
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:432
+#: nova/compute/api.py:474
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:549
+#: nova/compute/api.py:591
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:829
+#: nova/compute/api.py:871
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:849
+#: nova/compute/api.py:891
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:883
+#: nova/compute/api.py:925
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:921
+#: nova/compute/api.py:963
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:940
+#: nova/compute/api.py:982
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:944
+#: nova/compute/api.py:986
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1010 nova/volume/api.py:163
+#: nova/compute/api.py:1057 nova/volume/api.py:167
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1301
+#: nova/compute/api.py:1187
+#, python-format
+msgid "Image type not recognized %s"
+msgstr ""
+
+#: nova/compute/api.py:1355
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1309
+#: nova/compute/api.py:1363
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1578
+#: nova/compute/api.py:1630
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
 
-#: nova/compute/api.py:1810
-msgid "No compute host specified"
-msgstr ""
-
-#: nova/compute/api.py:1813
-#, python-format
-msgid "Unable to find host for Instance %s"
-msgstr ""
-
 #: nova/compute/instance_types.py:57 nova/compute/instance_types.py:65
 msgid "create arguments must be positive integers"
 msgstr ""
@@ -2952,453 +2963,455 @@ msgstr ""
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:236
+#: nova/compute/manager.py:223
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has been destroyed from under us while trying "
+"to set it to ERROR"
+msgstr ""
+
+#: nova/compute/manager.py:240
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:241
+#: nova/compute/manager.py:245
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:251
+#: nova/compute/manager.py:255
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:256
+#: nova/compute/manager.py:260
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:325
+#: nova/compute/manager.py:329
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:392
-#, python-format
-msgid ""
-"Going to force the deletion of the vm %(instance_uuid)s, even if it is "
-"deleted"
-msgstr ""
-
-#: nova/compute/manager.py:398
+#: nova/compute/manager.py:400
 #, python-format
-msgid ""
-"Instance %(instance_uuid)s did not exist in the DB, but I will shut it "
-"down anyway using a special context"
+msgid "Instance %s already deleted from database. Attempting forceful vm deletion"
 msgstr ""
 
-#: nova/compute/manager.py:404
+#: nova/compute/manager.py:406
 #, python-format
-msgid "exception terminating the instance %(instance_uuid)s"
+msgid "Exception encountered while terminating the instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:442
+#: nova/compute/manager.py:444
 #, python-format
 msgid "Instance %s not found."
 msgstr ""
 
-#: nova/compute/manager.py:478
+#: nova/compute/manager.py:480
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:521
+#: nova/compute/manager.py:523
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:526
+#: nova/compute/manager.py:528
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
 "size %(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/compute/manager.py:536
+#: nova/compute/manager.py:538
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:546
+#: nova/compute/manager.py:548
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:559
+#: nova/compute/manager.py:561
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:565
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:576
+#: nova/compute/manager.py:578
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:592
+#: nova/compute/manager.py:594
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:613
+#: nova/compute/manager.py:615
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:664
+#: nova/compute/manager.py:672
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:678
+#: nova/compute/manager.py:699
 #, python-format
-msgid "trying to destroy already destroyed instance: %s"
+msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:698
+#: nova/compute/manager.py:708
 #, python-format
-msgid "Ignoring DiskNotFound: %s"
+msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:707
+#: nova/compute/manager.py:742 nova/compute/manager.py:1327
+#: nova/compute/manager.py:1415 nova/compute/manager.py:2499
 #, python-format
-msgid "terminating bdm %s"
+msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:800
+#: nova/compute/manager.py:811
 #, python-format
 msgid ""
 "Cannot rebuild instance [%(instance_uuid)s], because the given image does"
 " not exist."
 msgstr ""
 
-#: nova/compute/manager.py:805
+#: nova/compute/manager.py:816
 #, python-format
 msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:812
+#: nova/compute/manager.py:823
 #, python-format
 msgid "Rebuilding instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:865
+#: nova/compute/manager.py:876
 #, python-format
 msgid "Rebooting instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:880
+#: nova/compute/manager.py:891
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:918
-#, python-format
-msgid "Image type not recognized %s"
-msgstr ""
-
-#: nova/compute/manager.py:930
+#: nova/compute/manager.py:933
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:936
+#: nova/compute/manager.py:939
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: %(instance_uuid)s (state: "
 "%(state)s expected: %(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:993
+#: nova/compute/manager.py:995
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:998
+#: nova/compute/manager.py:1001
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1002
+#: nova/compute/manager.py:1005
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1032
+#: nova/compute/manager.py:1035
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1038
+#: nova/compute/manager.py:1041
 #, python-format
 msgid "Instance %s: Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1047
+#: nova/compute/manager.py:1050
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1061
+#: nova/compute/manager.py:1064
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1076
+#: nova/compute/manager.py:1079
 #, python-format
 msgid ""
 "trying to inject a file into a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1081
+#: nova/compute/manager.py:1084
 #, python-format
 msgid "instance %(instance_uuid)s: injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1098
 #, python-format
 msgid ""
 "trying to update agent on a non-running instance: %(instance_uuid)s "
 "(state: %(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1100
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "instance %(instance_uuid)s: updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1113
+#: nova/compute/manager.py:1116
 #, python-format
 msgid "instance %s: rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1138
+#: nova/compute/manager.py:1141
 #, python-format
 msgid "instance %s: unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1269
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1275
+#: nova/compute/manager.py:1286
 #, python-format
 msgid "instance %s: migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1316 nova/compute/manager.py:1400
-#: nova/compute/manager.py:2413
-#, python-format
-msgid "%s. Setting instance vm_state to ERROR"
-msgstr ""
-
-#: nova/compute/manager.py:1453
+#: nova/compute/manager.py:1470
 #, python-format
 msgid "instance %s: pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1471
+#: nova/compute/manager.py:1488
 #, python-format
 msgid "instance %s: unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1507
+#: nova/compute/manager.py:1524
 #, python-format
 msgid "instance %s: retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1516
+#: nova/compute/manager.py:1533
 #, python-format
 msgid "instance %s: suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1538
+#: nova/compute/manager.py:1555
 #, python-format
 msgid "instance %s: resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1561
+#: nova/compute/manager.py:1578
 #, python-format
 msgid "instance %s: locking"
 msgstr ""
 
-#: nova/compute/manager.py:1570
+#: nova/compute/manager.py:1587
 #, python-format
 msgid "instance %s: unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1578
+#: nova/compute/manager.py:1595
 #, python-format
 msgid "instance %s: getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "instance %s: reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1596
+#: nova/compute/manager.py:1613
 #, python-format
 msgid "instance %s: inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1617
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1637
+#: nova/compute/manager.py:1654
 #, python-format
 msgid "instance %s: getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1684
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1685
+#: nova/compute/manager.py:1702
 #, python-format
 msgid ""
 "instance %(instance_uuid)s: attaching volume %(volume_id)s to "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1687
+#: nova/compute/manager.py:1704
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1696
+#: nova/compute/manager.py:1713
 #, python-format
 msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1706
+#: nova/compute/manager.py:1723
 #, python-format
 msgid "Attach failed %(mountpoint)s, removing"
 msgstr ""
 
-#: nova/compute/manager.py:1734
+#: nova/compute/manager.py:1751
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1738
+#: nova/compute/manager.py:1755
 #, python-format
 msgid "Detaching volume from unknown instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:1804
+#: nova/compute/manager.py:1821
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1883
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1894
+#: nova/compute/manager.py:1915
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1951
+#: nova/compute/manager.py:1972
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:1978
+#: nova/compute/manager.py:1999
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2029
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2016
+#: nova/compute/manager.py:2037
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2018
+#: nova/compute/manager.py:2039
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2056
+#: nova/compute/manager.py:2072
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2058
+#: nova/compute/manager.py:2074
 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:2073
+#: nova/compute/manager.py:2089
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2180
+#: nova/compute/manager.py:2225
 #, python-format
 msgid "Updated the info_cache for instance %s"
 msgstr ""
 
-#: nova/compute/manager.py:2209
+#: nova/compute/manager.py:2254
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2231
+#: nova/compute/manager.py:2276
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2259
+#: nova/compute/manager.py:2304
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2270
+#: nova/compute/manager.py:2330
+#, python-format
+msgid ""
+"During the sync_power process the instance %(uuid)s has moved from host "
+"%(src)s to host %(dst)s"
+msgstr ""
+
+#: nova/compute/manager.py:2343
+#, python-format
+msgid ""
+"Instance %s is in the process of migrating to this host. Wait next "
+"sync_power cycle before setting power state to NOSTATE"
+msgstr ""
+
+#: nova/compute/manager.py:2349
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2293
+#: nova/compute/manager.py:2379
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2305
+#: nova/compute/manager.py:2391
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2370
+#: nova/compute/manager.py:2456
 #, python-format
 msgid ""
 "Detected instance  with name label '%(name_label)s' which is marked as "
 "DELETED but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:2377
+#: nova/compute/manager.py:2463
 #, 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:2384
+#: nova/compute/manager.py:2470
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2454
+#: nova/compute/manager.py:2540
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
@@ -3473,31 +3486,31 @@ msgstr ""
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:56
+#: nova/db/sqlalchemy/api.py:57
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:188
+#: nova/db/sqlalchemy/api.py:198
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:566 nova/db/sqlalchemy/api.py:601
+#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4154 nova/db/sqlalchemy/api.py:4180
+#: nova/db/sqlalchemy/api.py:4030 nova/db/sqlalchemy/api.py:4056
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4238
+#: nova/db/sqlalchemy/api.py:4114
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4282
+#: nova/db/sqlalchemy/api.py:4158
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
@@ -3510,11 +3523,6 @@ msgstr ""
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:87
-#, python-format
-msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
 msgid "interface column not added to networks table"
 msgstr ""
@@ -3522,6 +3530,7 @@ msgstr ""
 #: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
 #: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
 #: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
@@ -3580,74 +3589,78 @@ msgstr ""
 msgid "dns_domains table not dropped"
 msgstr ""
 
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
+msgstr ""
+
 #: nova/image/glance.py:147
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:103
+#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:275
+#: nova/image/glance.py:278
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:281
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:286
+#: nova/image/glance.py:289
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:328 nova/image/glance.py:332
+#: nova/image/glance.py:331 nova/image/glance.py:335
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:407
+#: nova/image/glance.py:410
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
 
-#: nova/image/s3.py:296
+#: nova/image/s3.py:309
 #, python-format
 msgid "Failed to download %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:315
+#: nova/image/s3.py:328
 #, python-format
 msgid "Failed to decrypt %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:327
+#: nova/image/s3.py:340
 #, python-format
 msgid "Failed to untar %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:340
+#: nova/image/s3.py:353
 #, python-format
 msgid "Failed to upload %(image_location)s to %(image_path)s"
 msgstr ""
 
-#: nova/image/s3.py:366
+#: nova/image/s3.py:379
 #, python-format
 msgid "Failed to decrypt private key: %s"
 msgstr ""
 
-#: nova/image/s3.py:374
+#: nova/image/s3.py:387
 #, python-format
 msgid "Failed to decrypt initialization vector: %s"
 msgstr ""
 
-#: nova/image/s3.py:385
+#: nova/image/s3.py:398
 #, python-format
 msgid "Failed to decrypt image file %(image_file)s: %(err)s"
 msgstr ""
 
-#: nova/image/s3.py:397
+#: nova/image/s3.py:410
 msgid "Unsafe filenames in image"
 msgstr ""
 
@@ -3670,94 +3683,108 @@ msgstr ""
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:167
+#: nova/network/linux_net.py:166
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:193
+#: nova/network/linux_net.py:192
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:216
+#: nova/network/linux_net.py:215
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:336
+#: nova/network/linux_net.py:335
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:587 nova/network/linux_net.py:609
-#: nova/network/linux_net.py:651
-#, python-format
-msgid "Instance %(instance_id)s not found"
-msgstr ""
-
-#: nova/network/linux_net.py:718
+#: nova/network/linux_net.py:690
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:720
+#: nova/network/linux_net.py:692
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:780
+#: nova/network/linux_net.py:752
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:782
+#: nova/network/linux_net.py:754
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:984
+#: nova/network/linux_net.py:963
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1016
+#: nova/network/linux_net.py:995
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/manager.py:273 nova/network/manager.py:471
+#: nova/network/linux_net.py:1138
+#, python-format
+msgid "Starting bridge %s "
+msgstr ""
+
+#: nova/network/linux_net.py:1145
+#, python-format
+msgid "Done starting bridge %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1163
+#, python-format
+msgid "Failed unplugging gateway interface '%s'"
+msgstr ""
+
+#: nova/network/linux_net.py:1166
+#, python-format
+msgid "Unplugged gateway interface '%s'"
+msgstr ""
+
+#: nova/network/manager.py:292 nova/network/manager.py:488
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:288
+#: nova/network/manager.py:307
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:328
+#: nova/network/manager.py:345
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:361
+#: nova/network/manager.py:378
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:365
+#: nova/network/manager.py:382
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:377
+#: nova/network/manager.py:394
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:589
+#: nova/network/manager.py:606
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3765,41 +3792,41 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:635
+#: nova/network/manager.py:652
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:645
+#: nova/network/manager.py:662
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:753
+#: nova/network/manager.py:770
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:757
+#: nova/network/manager.py:774
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:871
+#: nova/network/manager.py:888
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:876
+#: nova/network/manager.py:893
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:905
+#: nova/network/manager.py:922
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1126
+#: nova/network/manager.py:1144
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -3807,68 +3834,68 @@ msgid ""
 " will be created."
 msgstr ""
 
-#: nova/network/manager.py:1201
+#: nova/network/manager.py:1222
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1205
+#: nova/network/manager.py:1226
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1213
+#: nova/network/manager.py:1234
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1218
+#: nova/network/manager.py:1239
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1222
+#: nova/network/manager.py:1243
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1225
+#: nova/network/manager.py:1246
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1294
+#: nova/network/manager.py:1309
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1297
+#: nova/network/manager.py:1312
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1308
+#: nova/network/manager.py:1323
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1367
+#: nova/network/manager.py:1382
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1386
+#: nova/network/manager.py:1401
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1703
+#: nova/network/manager.py:1810
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1710
+#: nova/network/manager.py:1817
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3883,7 +3910,7 @@ msgstr ""
 msgid "Tenant ID not set"
 msgstr ""
 
-#: nova/network/quantum/client.py:181
+#: nova/network/quantum/client.py:180
 #, python-format
 msgid "Quantum Client Request: %(method)s %(action)s"
 msgstr ""
@@ -3893,7 +3920,7 @@ msgstr ""
 msgid "Quantum entity not found: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:207
+#: nova/network/quantum/client.py:206
 #, python-format
 msgid "Server %(status_code)s error: %(data)s"
 msgstr ""
@@ -3903,7 +3930,7 @@ msgstr ""
 msgid "Unable to connect to server. Got error: %s"
 msgstr ""
 
-#: nova/network/quantum/client.py:229
+#: nova/network/quantum/client.py:228
 #, python-format
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
@@ -3936,42 +3963,42 @@ msgstr ""
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:207
+#: nova/network/quantum/manager.py:204
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:300
+#: nova/network/quantum/manager.py:301
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:577
+#: nova/network/quantum/manager.py:578
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:595
+#: nova/network/quantum/manager.py:596
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
 "|%(vif_uuid)s|"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:95
+#: nova/network/quantum/melange_connection.py:96
 #, python-format
 msgid "Server returned error: %s"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:97
+#: nova/network/quantum/melange_connection.py:98
 msgid "Connection error contacting melange service, retrying"
 msgstr ""
 
-#: nova/network/quantum/melange_connection.py:107
+#: nova/network/quantum/melange_connection.py:108
 #, python-format
 msgid ""
 "allocate IP on network |%(network_id)s| belonging to "
@@ -3994,15 +4021,15 @@ msgstr ""
 
 #: nova/network/quantum/nova_ipam_lib.py:221
 #, python-format
-msgid "No fixed IPs to deallocate for vif %sid"
+msgid "No fixed IPs to deallocate for vif %s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:100
+#: nova/network/quantum/quantum_connection.py:99
 #, python-format
 msgid "Connecting interface %(interface_id)s to net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/network/quantum/quantum_connection.py:114
+#: nova/network/quantum/quantum_connection.py:113
 #, python-format
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
@@ -4012,7 +4039,7 @@ msgstr ""
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:132
+#: nova/notifier/api.py:130
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4024,56 +4051,56 @@ msgstr ""
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:44
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:144 nova/rpc/impl_carrot.py:457
+#: nova/rpc/amqp.py:146 nova/rpc/impl_carrot.py:461
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/amqp.py:186 nova/rpc/impl_carrot.py:491
+#: nova/rpc/amqp.py:188 nova/rpc/impl_carrot.py:495
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:229 nova/rpc/impl_carrot.py:258
+#: nova/rpc/amqp.py:231 nova/rpc/impl_carrot.py:262
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:234 nova/rpc/impl_carrot.py:271
+#: nova/rpc/amqp.py:236 nova/rpc/impl_carrot.py:275
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:235 nova/rpc/impl_carrot.py:273
+#: nova/rpc/amqp.py:237 nova/rpc/impl_carrot.py:277
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:319 nova/rpc/impl_carrot.py:525
+#: nova/rpc/amqp.py:321 nova/rpc/impl_carrot.py:529
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:322 nova/rpc/impl_carrot.py:528
+#: nova/rpc/amqp.py:324 nova/rpc/impl_carrot.py:532
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:344 nova/rpc/impl_carrot.py:607
+#: nova/rpc/amqp.py:346 nova/rpc/impl_carrot.py:611
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:352 nova/rpc/impl_carrot.py:617
+#: nova/rpc/amqp.py:354 nova/rpc/impl_carrot.py:621
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377 nova/rpc/impl_carrot.py:627
+#: nova/rpc/amqp.py:379 nova/rpc/impl_carrot.py:631
 #, python-format
 msgid "Sending notification on %s..."
 msgstr ""
@@ -4089,119 +4116,127 @@ msgstr ""
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:195
+#: nova/rpc/impl_carrot.py:199
 #, python-format
 msgid ""
 "AMQP server on %(fl_host)s:%(fl_port)d is unreachable: %(e)s. Trying "
 "again in %(fl_intv)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:199
+#: nova/rpc/impl_carrot.py:203
 #, python-format
 msgid "Unable to connect to AMQP server after %(tries)d tries. Shutting down."
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:219
+#: nova/rpc/impl_carrot.py:223
 msgid "Reconnected to queue"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:226
+#: nova/rpc/impl_carrot.py:230
 #, python-format
 msgid "Failed to fetch message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:234
+#: nova/rpc/impl_carrot.py:238
 #, python-format
 msgid "Initing the Adapter Consumer for %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:333
+#: nova/rpc/impl_carrot.py:337
 #, python-format
 msgid "Created \"%(exchange)s\" fanout exchange with \"%(key)s\" routing key"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:378
+#: nova/rpc/impl_carrot.py:382
 msgid "Exception while processing consumer"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:415
+#: nova/rpc/impl_carrot.py:419
 #, python-format
 msgid "Creating \"%(exchange)s\" fanout exchange"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:642
+#: nova/rpc/impl_carrot.py:646
 #, python-format
 msgid "response %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:651
+#: nova/rpc/impl_carrot.py:655
 #, python-format
 msgid "topic is %s"
 msgstr ""
 
-#: nova/rpc/impl_carrot.py:652
+#: nova/rpc/impl_carrot.py:656
 #, python-format
 msgid "message %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:404
+#: nova/rpc/impl_kombu.py:111
+msgid "Failed to process message... skipping it."
+msgstr ""
+
+#: nova/rpc/impl_kombu.py:407
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:427
+#: nova/rpc/impl_kombu.py:430
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:463
+#: nova/rpc/impl_kombu.py:466
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:479
+#: nova/rpc/impl_kombu.py:482
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:530 nova/rpc/impl_qpid.py:384
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:548 nova/rpc/impl_qpid.py:399
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:552 nova/rpc/impl_qpid.py:403
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:586 nova/rpc/impl_qpid.py:430
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:340
+#: nova/rpc/impl_qpid.py:341
 #, python-format
 msgid "Unable to connect to AMQP server: %s "
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:345
+#: nova/rpc/impl_qpid.py:346
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:353
+#: nova/rpc/impl_qpid.py:354
 msgid "Re-established AMQP queues"
 msgstr ""
 
+#: nova/rpc/impl_qpid.py:412
+msgid "Error processing message.  Skipping it."
+msgstr ""
+
 #: nova/scheduler/chance.py:47 nova/scheduler/simple.py:91
 #: nova/scheduler/simple.py:143
 msgid "Is the appropriate service running?"
@@ -4211,30 +4246,6 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/distributed_scheduler.py:51
-#, python-format
-msgid "No host selection for %s defined."
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:64
-#, python-format
-msgid "Attempting to build %(num_instances)d instance(s)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:157
-msgid "Scheduler only understands Compute nodes (for now)"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:199
-#, python-format
-msgid "Filtered %(hosts)s"
-msgstr ""
-
-#: nova/scheduler/distributed_scheduler.py:209
-#, python-format
-msgid "Weighted %(weighted_host)s"
-msgstr ""
-
 #: nova/scheduler/driver.py:63
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
@@ -4259,182 +4270,135 @@ msgstr ""
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:314
+#: nova/scheduler/driver.py:185
+msgid "Driver must implement schedule_prep_resize"
+msgstr ""
+
+#: nova/scheduler/driver.py:190
+msgid "Driver must implement schedule_run_instance"
+msgstr ""
+
+#: nova/scheduler/driver.py:324
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:322
+#: nova/scheduler/driver.py:332
 #, python-format
 msgid ""
 "Cannot confirm tmpfile at %(ipath)s is on same shared storage between "
 "%(src)s and %(dest)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:360 nova/scheduler/driver.py:450
+#: nova/scheduler/driver.py:370 nova/scheduler/driver.py:460
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:409
+#: nova/scheduler/driver.py:419
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:465
+#: nova/scheduler/driver.py:475
 #, python-format
 msgid ""
-"Unable to migrate %(instance_id)s to %(dest)s: Lack of "
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "disk(host:%(available)s <= instance:%(necessary)s)"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:259
+#: nova/scheduler/filter_scheduler.py:51
 #, python-format
-msgid "Received %(service_name)s service update from %(host)s."
-msgstr ""
-
-#: nova/scheduler/host_manager.py:300
-msgid "host_manager only implemented for 'compute'"
-msgstr ""
-
-#: nova/scheduler/host_manager.py:310
-#, python-format
-msgid "No service for compute ID %s"
-msgstr ""
-
-#: nova/scheduler/manager.py:86
-#, python-format
-msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-msgstr ""
-
-#: nova/scheduler/manager.py:102
-#, python-format
-msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
-
-#: nova/scheduler/manager.py:117
-#, python-format
-msgid "Setting instance %(instance_uuid)s to ERROR state."
-msgstr ""
-
-#: nova/scheduler/scheduler_options.py:67
-#, python-format
-msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
+msgid "No host selection for %s defined."
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:75
+#: nova/scheduler/filter_scheduler.py:64
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
-
-#: nova/scheduler/simple.py:87
-msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
-
-#: nova/scheduler/simple.py:137
-msgid "Not enough allocatable volume gigabytes remaining"
+msgid "Attempting to build %(num_instances)d instance(s)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:112
-#, python-format
-msgid "_filter_hosts: %(request_spec)s"
+#: nova/scheduler/filter_scheduler.py:157
+msgid "Scheduler only understands Compute nodes (for now)"
 msgstr ""
 
-#: nova/scheduler/vsa.py:115
+#: nova/scheduler/filter_scheduler.py:199
 #, python-format
-msgid "Filter hosts for drive type %s"
+msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:132
+#: nova/scheduler/filter_scheduler.py:209
 #, python-format
-msgid "Host %s has no free capacity. Skip"
+msgid "Weighted %(weighted_host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:137
+#: nova/scheduler/host_manager.py:144
 #, python-format
-msgid "Filter hosts: %s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:153
-msgid "Must implement host selection mechanism"
+msgid "Host filter fails for ignored host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:163
+#: nova/scheduler/host_manager.py:151
 #, python-format
-msgid "Maximum number of hosts selected (%d)"
+msgid "Host filter fails for non-forced host %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:171
+#: nova/scheduler/host_manager.py:157
 #, python-format
-msgid "Selected excessive host %(host)s"
+msgid "Host filter function %(func)s failed for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:211
+#: nova/scheduler/host_manager.py:163
 #, python-format
-msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+msgid "Host filter passes for %(host)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:239
+#: nova/scheduler/host_manager.py:272
 #, python-format
-msgid "volume_params %(volume_params)s"
+msgid "Received %(service_name)s service update from %(host)s."
 msgstr ""
 
-#: nova/scheduler/vsa.py:244
-#, python-format
-msgid "%(i)d: Volume %(name)s"
+#: nova/scheduler/host_manager.py:313
+msgid "host_manager only implemented for 'compute'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:282
+#: nova/scheduler/host_manager.py:323
 #, python-format
-msgid "Attempting to spawn %(num_volumes)d volume(s)"
-msgstr ""
-
-#: nova/scheduler/vsa.py:298
-msgid "Error creating volumes"
+msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:328
+#: nova/scheduler/manager.py:85
 #, python-format
-msgid "Non-VSA volume %d"
+msgid ""
+"Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
+"schedule()"
 msgstr ""
 
-#: nova/scheduler/vsa.py:341
+#: nova/scheduler/manager.py:150
 #, python-format
-msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-msgstr ""
-
-#: nova/scheduler/vsa.py:351
-msgid "Error creating volume"
+msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/vsa.py:391
+#: nova/scheduler/manager.py:159
 #, python-format
-msgid "No capability selected for volume of size %(size)s"
+msgid "Setting instance %(instance_uuid)s to %(state)s state."
 msgstr ""
 
-#: nova/scheduler/vsa.py:411
+#: nova/scheduler/scheduler_options.py:66
 #, python-format
-msgid "Host %s:"
+msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:420
+#: nova/scheduler/scheduler_options.py:75
 #, python-format
-msgid ""
-"\tDrive %(qosgrp)-25s: total %(total)2s, used %(used)2s, free %(free)2s. "
-"Available capacity %(avail)-5s"
+msgid "Could not decode scheduler options: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/vsa.py:483
-#, python-format
-msgid "\t LeastUsedHost: Best host: %(best_host)s. (used capacity %(min_used)s)"
+#: nova/scheduler/simple.py:87
+msgid "Not enough allocatable CPU cores remaining"
 msgstr ""
 
-#: nova/scheduler/vsa.py:528
-#, python-format
-msgid ""
-"\t MostAvailCap: Best host: %(best_host)s. (available %(max_avail)s "
-"%(type_str)s)"
+#: nova/scheduler/simple.py:137
+msgid "Not enough allocatable volume gigabytes remaining"
 msgstr ""
 
 #: nova/scheduler/filters/core_filter.py:45
@@ -4491,34 +4455,34 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:778
+#: nova/tests/fakelibvirt.py:784
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:790
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:380 nova/tests/test_compute.py:1490
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1419
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:386
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:610
+#: nova/tests/test_compute.py:589
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1501
+#: nova/tests/test_compute.py:1430
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/test_misc.py:113
+#: nova/tests/test_misc.py:92
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -4581,27 +4545,19 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_vsa.py:55
-msgid "Test: Emulate wrong VSA name. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:93
-msgid "Test: Emulate DB error. Raise"
-msgstr ""
-
-#: nova/tests/test_vsa.py:161
+#: nova/tests/test_xenapi.py:621
 #, python-format
-msgid "Test: user_data = %s"
+msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:636
+#: nova/tests/test_xenapi.py:632
 #, python-format
-msgid "Creating files in %s to simulate guest agent"
+msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:647
+#: nova/tests/api/openstack/compute/test_servers.py:2102
 #, python-format
-msgid "Removing simulated guest agent files in %s"
+msgid "Quota exceeded: code=%(code)s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4610,19 +4566,16 @@ msgid "_create: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:69
 #, python-format
 msgid "_delete: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:78
 #, python-format
 msgid "_get: %s"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:88
 #, python-format
 msgid "_get_all: %s"
 msgstr ""
@@ -4657,11 +4610,6 @@ msgstr ""
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_vsa.py:57
-#, python-format
-msgid "_create: param=%s"
-msgstr ""
-
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
@@ -4716,77 +4664,37 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:131
+#: nova/tests/rpc/common.py:133
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:139
+#: nova/tests/rpc/common.py:142
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:157
+#: nova/tests/rpc/common.py:160
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:187 nova/tests/rpc/common.py:193
+#: nova/tests/rpc/common.py:227 nova/tests/rpc/common.py:233
 #, python-format
 msgid "Received %s"
 msgstr ""
 
-#: nova/tests/scheduler/test_vsa_scheduler.py:147
-#, python-format
-msgid "Host %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:196
-#, python-format
-msgid "Test: provision vol %(name)s on host %(host)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:198
-#, python-format
-msgid "\t vol=%(vol)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:201
-#, python-format
-msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:205
-#, python-format
-msgid "Test: Volume create: %s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:212
-#, python-format
-msgid "Test: Volume get request: id=%(volume_id)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:219
-#, python-format
-msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-msgstr ""
-
-#: nova/tests/scheduler/test_vsa_scheduler.py:455
-#, python-format
-msgid "Test: Volume get: id=%(volume_id)s"
-msgstr ""
-
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:420
-#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1789
+#: nova/virt/fake.py:270 nova/virt/xenapi_conn.py:397
+#: nova/virt/baremetal/proxy.py:716 nova/virt/libvirt/connection.py:1833
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:423
-#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1792
+#: nova/virt/fake.py:273 nova/virt/xenapi_conn.py:400
+#: nova/virt/baremetal/proxy.py:720 nova/virt/libvirt/connection.py:1836
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
@@ -4810,21 +4718,21 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:402 nova/virt/xenapi/firewall.py:89
+#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
 
-#: nova/virt/images.py:95
+#: nova/virt/images.py:94
 msgid "'qemu-img info' parsing failed."
 msgstr ""
 
-#: nova/virt/images.py:101
+#: nova/virt/images.py:100
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
 msgstr ""
 
-#: nova/virt/images.py:114
+#: nova/virt/images.py:113
 #, python-format
 msgid "Converted to raw, but format is now %s"
 msgstr ""
@@ -4860,40 +4768,30 @@ msgstr ""
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:163
+#: nova/virt/xenapi_conn.py:140
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:353 nova/virt/libvirt/connection.py:446
+#: nova/virt/xenapi_conn.py:330 nova/virt/libvirt/connection.py:465
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:484
+#: nova/virt/xenapi_conn.py:461
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:513
+#: nova/virt/xenapi_conn.py:491
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:539
+#: nova/virt/xenapi_conn.py:529
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi_conn.py:631
-#, python-format
-msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:640
-#, python-format
-msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-msgstr ""
-
-#: nova/virt/xenapi_conn.py:660 nova/virt/xenapi_conn.py:673
+#: nova/virt/xenapi_conn.py:611 nova/virt/xenapi_conn.py:624
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
@@ -5076,7 +4974,7 @@ msgstr ""
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
@@ -5098,7 +4996,7 @@ msgstr ""
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1559
+#: nova/virt/baremetal/proxy.py:574 nova/virt/libvirt/connection.py:1603
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5113,8 +5011,8 @@ msgstr ""
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2336
-#: nova/virt/xenapi/host.py:124
+#: nova/virt/baremetal/proxy.py:773 nova/virt/libvirt/connection.py:2387
+#: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
 
@@ -5139,44 +5037,58 @@ msgstr ""
 msgid "Before ping to the bare-metal node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:317
+#: nova/virt/baremetal/tilera.py:275
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is ready"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:279
+#, python-format
+msgid "TILERA_BOARD_#%(node_id)s %(node_ip)s is not ready, out_msg=%(out_msg)s"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:292
+msgid "Noting to do for tilera nodes: vmlinux is in CF"
+msgstr ""
+
+#: nova/virt/baremetal/tilera.py:316
 msgid "activate_node"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:331
+#: nova/virt/baremetal/tilera.py:330
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/disk/api.py:152
+#: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:165
+#: nova/virt/disk/api.py:178
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:176
+#: nova/virt/disk/api.py:189
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:263 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
 #: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:278
+#: nova/virt/disk/api.py:291
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:441
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:444
+#: nova/virt/disk/api.py:457
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5222,170 +5134,167 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:253
+#: nova/virt/libvirt/connection.py:258
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:267
+#: nova/virt/libvirt/connection.py:279
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:369
+#: nova/virt/libvirt/connection.py:381
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:381
+#: nova/virt/libvirt/connection.py:393
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:392
+#: nova/virt/libvirt/connection.py:404
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:404
+#: nova/virt/libvirt/connection.py:416
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:435
+#: nova/virt/libvirt/connection.py:428
+#, python-format
+msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:454
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:528
+#: nova/virt/libvirt/connection.py:547
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:541
+#: nova/virt/libvirt/connection.py:560
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:662
+#: nova/virt/libvirt/connection.py:681
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:666
+#: nova/virt/libvirt/connection.py:685
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:689
+#: nova/virt/libvirt/connection.py:714
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:725 nova/virt/libvirt/connection.py:871
+#: nova/virt/libvirt/connection.py:750 nova/virt/libvirt/connection.py:894
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:730
+#: nova/virt/libvirt/connection.py:755
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:831 nova/virt/xenapi/vmops.py:1404
+#: nova/virt/libvirt/connection.py:856 nova/virt/xenapi/vmops.py:1389
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:835 nova/virt/xenapi/vmops.py:1408
+#: nova/virt/libvirt/connection.py:860 nova/virt/xenapi/vmops.py:1393
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:862
+#: nova/virt/libvirt/connection.py:885
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:876
+#: nova/virt/libvirt/connection.py:899
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:884
-#, python-format
-msgid "virsh said: %r"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:888
-msgid "cool, it's a device"
-msgstr ""
-
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:915
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:926
-msgid "Unable to read LXC console"
-msgstr ""
+#: nova/virt/libvirt/connection.py:967
+#, fuzzy
+msgid "Guest does not have a console available"
+msgstr "使用者並沒有管理者權力"
 
-#: nova/virt/libvirt/connection.py:1049
+#: nova/virt/libvirt/connection.py:1098
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1236
+#: nova/virt/libvirt/connection.py:1280
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1245
+#: nova/virt/libvirt/connection.py:1290
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1277
+#: nova/virt/libvirt/connection.py:1322
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1402
+#: nova/virt/libvirt/connection.py:1446
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1406
+#: nova/virt/libvirt/connection.py:1450
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1423
+#: nova/virt/libvirt/connection.py:1467
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1664
+#: nova/virt/libvirt/connection.py:1708
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1686
+#: nova/virt/libvirt/connection.py:1730
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1713
+#: nova/virt/libvirt/connection.py:1757
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1810
+#: nova/virt/libvirt/connection.py:1854
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1813
+#: nova/virt/libvirt/connection.py:1857
 #, python-format
 msgid ""
 "to xml...\n"
 ":%s "
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1816
+#: nova/virt/libvirt/connection.py:1860
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5395,35 +5304,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1873
+#: nova/virt/libvirt/connection.py:1917
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2088
+#: nova/virt/libvirt/connection.py:2133
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2184
+#: nova/virt/libvirt/connection.py:2188
+#, python-format
+msgid "Getting disk size of %(i_name)s: %(e)s"
+msgstr ""
+
+#: nova/virt/libvirt/connection.py:2236
 #, python-format
 msgid "Instance %s: Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2239
+#: nova/virt/libvirt/connection.py:2291
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2244
+#: nova/virt/libvirt/connection.py:2296
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2251
+#: nova/virt/libvirt/connection.py:2303
 #, python-format
 msgid "Instance %s: Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2292
+#: nova/virt/libvirt/connection.py:2343
 #, python-format
 msgid "Instance %s: Starting finish_revert_migration"
 msgstr ""
@@ -5442,148 +5356,149 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:160
+#: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:206
+#: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:222
+#: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:241
+#: nova/virt/libvirt/firewall.py:252
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:171
+#: nova/virt/libvirt/imagecache.py:168
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:174
+#: nova/virt/libvirt/imagecache.py:171
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:176
+#: nova/virt/libvirt/imagecache.py:173
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:187
+#: nova/virt/libvirt/imagecache.py:184
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:238
+#: nova/virt/libvirt/imagecache.py:235
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:250
+#: nova/virt/libvirt/imagecache.py:245
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): image verification skipped, "
-"no hash stored"
+msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:270
+#: nova/virt/libvirt/imagecache.py:264
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:282
+#: nova/virt/libvirt/imagecache.py:276
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:285
+#: nova/virt/libvirt/imagecache.py:279
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:292
+#: nova/virt/libvirt/imagecache.py:286
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:303
+#: nova/virt/libvirt/imagecache.py:297
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:320
+#: nova/virt/libvirt/imagecache.py:313
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use: on this node "
-"%(local)d local, %(remote)d on other nodes"
+"%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
+"on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:333
+#: nova/virt/libvirt/imagecache.py:325
 #, python-format
 msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): warning -- an absent base "
-"file is in use! instances: %(instance_list)s"
+"%(id)s (%(base_file)s): warning -- an absent base file is in use! "
+"instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:344
+#: nova/virt/libvirt/imagecache.py:333
 #, python-format
-msgid ""
-"%(container_format)s-%(id)s (%(base_file)s): in use on (%(remote)d on "
-"other nodes)"
+msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:355
+#: nova/virt/libvirt/imagecache.py:343
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:363
+#: nova/virt/libvirt/imagecache.py:349
 #, python-format
-msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:387
+#: nova/virt/libvirt/imagecache.py:369
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:391
+#: nova/virt/libvirt/imagecache.py:373
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:419
+#: nova/virt/libvirt/imagecache.py:380
+#, python-format
+msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
+msgstr ""
+
+#: nova/virt/libvirt/imagecache.py:398
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:424
+#: nova/virt/libvirt/imagecache.py:403
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:427
+#: nova/virt/libvirt/imagecache.py:406
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:431
+#: nova/virt/libvirt/imagecache.py:410
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:439
+#: nova/virt/libvirt/imagecache.py:418
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:240
+#: nova/virt/libvirt/utils.py:264
 msgid "Unable to find an open port"
 msgstr ""
 
@@ -5592,29 +5507,29 @@ msgstr ""
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:93
+#: nova/virt/libvirt/vif.py:94
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:156
+#: nova/virt/libvirt/vif.py:157 nova/virt/libvirt/vif.py:201
 #, python-format
 msgid "Failed while unplugging vif of instance '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:153 nova/volume/driver.py:817
+#: nova/virt/libvirt/volume.py:153
 #, python-format
 msgid "iSCSI device not found at %s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:156 nova/volume/driver.py:820
+#: nova/virt/libvirt/volume.py:156
 #, python-format
 msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
 
-#: nova/virt/libvirt/volume.py:168 nova/volume/driver.py:832
+#: nova/virt/libvirt/volume.py:168
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
 msgstr ""
@@ -5733,260 +5648,260 @@ msgstr ""
 msgid "Got total of %s instances"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:125
+#: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:195
+#: nova/virt/vmwareapi/vmops.py:196
 #, python-format
 msgid "Creating VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:204
+#: nova/virt/vmwareapi/vmops.py:205
 #, python-format
 msgid "Created VM with the name %s on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:233
+#: nova/virt/vmwareapi/vmops.py:234
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:250
+#: nova/virt/vmwareapi/vmops.py:251
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:259
+#: nova/virt/vmwareapi/vmops.py:260
 #, python-format
 msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:271
+#: nova/virt/vmwareapi/vmops.py:272
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:282
+#: nova/virt/vmwareapi/vmops.py:283
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:297
+#: nova/virt/vmwareapi/vmops.py:298
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:314
+#: nova/virt/vmwareapi/vmops.py:315
 #, python-format
 msgid "Reconfiguring VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:321
+#: nova/virt/vmwareapi/vmops.py:322
 #, python-format
 msgid "Reconfigured VM instance %s to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:328
+#: nova/virt/vmwareapi/vmops.py:329
 #, python-format
 msgid "Powering on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:334
+#: nova/virt/vmwareapi/vmops.py:335
 #, python-format
 msgid "Powered on the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:379
+#: nova/virt/vmwareapi/vmops.py:381
 #, python-format
 msgid "Creating Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:389
+#: nova/virt/vmwareapi/vmops.py:391
 #, python-format
 msgid "Created Snapshot of the VM instance %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:432
+#: nova/virt/vmwareapi/vmops.py:434
 #, python-format
 msgid "Copying disk data before snapshot of the VM  instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:445
+#: nova/virt/vmwareapi/vmops.py:447
 #, python-format
 msgid "Copied disk data before snapshot of the VM instance %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:454
+#: nova/virt/vmwareapi/vmops.py:456
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:467
+#: nova/virt/vmwareapi/vmops.py:469
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:477
+#: nova/virt/vmwareapi/vmops.py:479
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:486
+#: nova/virt/vmwareapi/vmops.py:488
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:518
+#: nova/virt/vmwareapi/vmops.py:520
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:525
+#: nova/virt/vmwareapi/vmops.py:527
 #, python-format
 msgid "Rebooting guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:528
+#: nova/virt/vmwareapi/vmops.py:530
 #, python-format
 msgid "Rebooted guest OS of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
+#: nova/virt/vmwareapi/vmops.py:532
 #, python-format
 msgid "Doing hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:534
+#: nova/virt/vmwareapi/vmops.py:536
 #, python-format
 msgid "Did hard reboot of VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:546
+#: nova/virt/vmwareapi/vmops.py:548
 #, python-format
 msgid "instance - %s not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:565
+#: nova/virt/vmwareapi/vmops.py:567
 #, python-format
 msgid "Powering off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:570
+#: nova/virt/vmwareapi/vmops.py:572
 #, python-format
 msgid "Powered off the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:574
+#: nova/virt/vmwareapi/vmops.py:576
 #, python-format
 msgid "Unregistering the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:577
+#: nova/virt/vmwareapi/vmops.py:579
 #, python-format
 msgid "Unregistered the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
+#: nova/virt/vmwareapi/vmops.py:581
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:590
+#: nova/virt/vmwareapi/vmops.py:592
 #, python-format
 msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:600
+#: nova/virt/vmwareapi/vmops.py:602
 #, python-format
 msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:605
+#: nova/virt/vmwareapi/vmops.py:607
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:613
+#: nova/virt/vmwareapi/vmops.py:615
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:617
+#: nova/virt/vmwareapi/vmops.py:619
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:631
+#: nova/virt/vmwareapi/vmops.py:633
 #, python-format
 msgid "Suspending the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:635
+#: nova/virt/vmwareapi/vmops.py:637
 #, python-format
 msgid "Suspended the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:638
+#: nova/virt/vmwareapi/vmops.py:640
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:641
+#: nova/virt/vmwareapi/vmops.py:643
 #, python-format
 msgid "VM %s was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:654
+#: nova/virt/vmwareapi/vmops.py:656
 #, python-format
 msgid "Resuming the VM %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:659
+#: nova/virt/vmwareapi/vmops.py:661
 #, python-format
 msgid "Resumed the VM %s "
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
+#: nova/virt/vmwareapi/vmops.py:663
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:697
+#: nova/virt/vmwareapi/vmops.py:699
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:755
+#: nova/virt/vmwareapi/vmops.py:757
 #, python-format
 msgid ""
 "Reconfiguring VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:763
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
 msgid ""
 "Reconfigured VM instance %(name)s to set the machine id with ip - "
 "%(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:800
+#: nova/virt/vmwareapi/vmops.py:802
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:804
+#: nova/virt/vmwareapi/vmops.py:806
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -6021,27 +5936,27 @@ msgstr ""
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:555 nova/virt/xenapi/fake.py:654
-#: nova/virt/xenapi/fake.py:672 nova/virt/xenapi/fake.py:734
+#: nova/virt/xenapi/fake.py:553 nova/virt/xenapi/fake.py:652
+#: nova/virt/xenapi/fake.py:670 nova/virt/xenapi/fake.py:732
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:557
+#: nova/virt/xenapi/fake.py:555
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:591
+#: nova/virt/xenapi/fake.py:589
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:596
+#: nova/virt/xenapi/fake.py:594
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:656
+#: nova/virt/xenapi/fake.py:654
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6055,16 +5970,16 @@ msgid ""
 " assuming it is a worker VM and skipping migration to a new host"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:132
+#: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:166
+#: nova/virt/xenapi/host.py:169
 msgid "Unable to get updated status"
 msgstr ""
 
-#: nova/virt/xenapi/host.py:169
+#: nova/virt/xenapi/host.py:172
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s."
 msgstr ""
@@ -6094,27 +6009,27 @@ msgstr ""
 msgid "Unable to eject %(host)s from the pool; No master found"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:145
+#: nova/virt/xenapi/pool.py:143
 #, python-format
 msgid "Pool-Join failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:148
+#: nova/virt/xenapi/pool.py:146
 #, python-format
 msgid "Unable to join %(host)s in the pool"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:164
+#: nova/virt/xenapi/pool.py:162
 #, python-format
 msgid "Pool-eject failed: %(e)s"
 msgstr ""
 
-#: nova/virt/xenapi/pool.py:176
+#: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
 msgid "Unable to set up pool: %(e)s."
 msgstr "無法卸載 Volume %s"
 
-#: nova/virt/xenapi/pool.py:187
+#: nova/virt/xenapi/pool.py:185
 #, python-format
 msgid "Pool-set_name_label failed: %(e)s"
 msgstr ""
@@ -6131,437 +6046,426 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:214
+#: nova/virt/xenapi/vm_utils.py:218
 #, python-format
 msgid "Created VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:217
+#: nova/virt/xenapi/vm_utils.py:221
 #, python-format
 msgid "Created VM %(instance_name)s as %(vm_ref)s."
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:248
 #, python-format
-msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:251
+#: nova/virt/xenapi/vm_utils.py:265
 #, python-format
-msgid ""
-"Created a CDROM-specific VBD %(vbd_ref)s  for VM %(vm_ref)s, VDI "
-"%(vdi_ref)s."
+msgid "VBD %s already detached"
 msgstr ""
 
 #: nova/virt/xenapi/vm_utils.py:268
 #, python-format
-msgid "VBD not found in instance %s"
+msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:279
+#: nova/virt/xenapi/vm_utils.py:273
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:290
+#: nova/virt/xenapi/vm_utils.py:278
+#, python-format
+msgid "Reached maximum number of retries trying to unplug VBD %s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:289
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:300
+#: nova/virt/xenapi/vm_utils.py:308
+#, python-format
+msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:311
+#, python-format
+msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:322
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:317
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:326
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:334
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:353
+#: nova/virt/xenapi/vm_utils.py:375
 #, python-format
 msgid "No primary VDI found for%(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:360
+#: nova/virt/xenapi/vm_utils.py:382
 #, python-format
 msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:374
+#: nova/virt/xenapi/vm_utils.py:395
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:413
+#: nova/virt/xenapi/vm_utils.py:434
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:623
+#: nova/virt/xenapi/vm_utils.py:641
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:702
+#: nova/virt/xenapi/vm_utils.py:733
+#, python-format
+msgid ""
+"download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
+"%(glance_host)s:%(glance_port)s"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:743
+#, python-format
+msgid "download_vhd failed: %r"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:760
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:730
+#: nova/virt/xenapi/vm_utils.py:770
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:759
+#: nova/virt/xenapi/vm_utils.py:798
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:774
+#: nova/virt/xenapi/vm_utils.py:814
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:778
+#: nova/virt/xenapi/vm_utils.py:818
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:801
+#: nova/virt/xenapi/vm_utils.py:841
 #, python-format
 msgid "Fetching image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:802
+#: nova/virt/xenapi/vm_utils.py:842
 #, python-format
 msgid "Image Type: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:806
+#: nova/virt/xenapi/vm_utils.py:846
 msgid "ISO: Found sr possibly containing the ISO image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:815
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid "Size for image %(image)s:%(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:824
+#: nova/virt/xenapi/vm_utils.py:864
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:841
+#: nova/virt/xenapi/vm_utils.py:881
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:894
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:863
+#: nova/virt/xenapi/vm_utils.py:904
 #, python-format
 msgid "instance %s: Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:902
+#: nova/virt/xenapi/vm_utils.py:943
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:924
+#: nova/virt/xenapi/vm_utils.py:964
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:942
+#: nova/virt/xenapi/vm_utils.py:982
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:985
+#: nova/virt/xenapi/vm_utils.py:1025
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1031
+#: nova/virt/xenapi/vm_utils.py:1071
 #, python-format
 msgid "(VM_UTILS) xenserver vm state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1033
+#: nova/virt/xenapi/vm_utils.py:1073
 #, python-format
 msgid "(VM_UTILS) xenapi power_state -> |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
+#: nova/virt/xenapi/vm_utils.py:1100
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1080
+#: nova/virt/xenapi/vm_utils.py:1120
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1111
+#: nova/virt/xenapi/vm_utils.py:1148
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1129
+#: nova/virt/xenapi/vm_utils.py:1166
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1142
+#: nova/virt/xenapi/vm_utils.py:1179
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1150
+#: nova/virt/xenapi/vm_utils.py:1187
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1152
+#: nova/virt/xenapi/vm_utils.py:1189
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1192
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1158
+#: nova/virt/xenapi/vm_utils.py:1195
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1162
+#: nova/virt/xenapi/vm_utils.py:1199
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1164
+#: nova/virt/xenapi/vm_utils.py:1201
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1167
+#: nova/virt/xenapi/vm_utils.py:1204
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1170
+#: nova/virt/xenapi/vm_utils.py:1207
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1173
+#: nova/virt/xenapi/vm_utils.py:1210
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1195
+#: nova/virt/xenapi/vm_utils.py:1232
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1211
+#: nova/virt/xenapi/vm_utils.py:1248
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1265
+#: nova/virt/xenapi/vm_utils.py:1302
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1318
+#: nova/virt/xenapi/vm_utils.py:1355
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1392
+#: nova/virt/xenapi/vm_utils.py:1429
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1402
+#: nova/virt/xenapi/vm_utils.py:1439
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1437
+#: nova/virt/xenapi/vm_utils.py:1474
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1456
-#, python-format
-msgid "Creating VBD for VDI %s ... "
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1458
-#, python-format
-msgid "Creating VBD for VDI %s done."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1460
+#: nova/virt/xenapi/vm_utils.py:1485
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1488
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1465
+#: nova/virt/xenapi/vm_utils.py:1490
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1468
+#: nova/virt/xenapi/vm_utils.py:1493
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1481
+#: nova/virt/xenapi/vm_utils.py:1510
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1492
-msgid "VBD.unplug successful first time."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1497
-msgid "VBD.unplug rejected: retrying..."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1499
-msgid "Not sleeping anymore!"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1502
-msgid "VBD.unplug successful eventually."
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1505
-#, python-format
-msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1514
-#, python-format
-msgid "Ignoring XenAPI.Failure %s"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1528
+#: nova/virt/xenapi/vm_utils.py:1523
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1535
+#: nova/virt/xenapi/vm_utils.py:1530
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1537
+#: nova/virt/xenapi/vm_utils.py:1532
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1550
+#: nova/virt/xenapi/vm_utils.py:1545
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1556
+#: nova/virt/xenapi/vm_utils.py:1551
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1582
+#: nova/virt/xenapi/vm_utils.py:1577
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1595
+#: nova/virt/xenapi/vm_utils.py:1590
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1649
+#: nova/virt/xenapi/vm_utils.py:1644
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1681
+#: nova/virt/xenapi/vm_utils.py:1676
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1731
+#: nova/virt/xenapi/vm_utils.py:1726
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1739
+#: nova/virt/xenapi/vm_utils.py:1734
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1738
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1759
+#: nova/virt/xenapi/vm_utils.py:1754
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1769
+#: nova/virt/xenapi/vm_utils.py:1764
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:129 nova/virt/xenapi/vmops.py:728
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
@@ -6595,276 +6499,276 @@ msgstr ""
 msgid "Instance %(instance_uuid)s: Failed to spawn, rolling back."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:465
+#: nova/virt/xenapi/vmops.py:464
 #, python-format
 msgid ""
 "Auto configuring disk for instance %(instance_uuid)s, attempting to "
 "resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:524
+#: nova/virt/xenapi/vmops.py:519
 #, python-format
 msgid "Invalid value for injected_files: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:529
+#: nova/virt/xenapi/vmops.py:524
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:530
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:539
+#: nova/virt/xenapi/vmops.py:534
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:546
+#: nova/virt/xenapi/vmops.py:541
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:547
 #, python-format
 msgid "Starting VM %s..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:555
+#: nova/virt/xenapi/vmops.py:550
 #, python-format
 msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:562
+#: nova/virt/xenapi/vmops.py:557
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:565
+#: nova/virt/xenapi/vmops.py:560
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:572
+#: nova/virt/xenapi/vmops.py:567
 #, python-format
 msgid "Instance %s: waiting for running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:581
+#: nova/virt/xenapi/vmops.py:576
 #, python-format
 msgid "Instance %s: running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:585
+#: nova/virt/xenapi/vmops.py:580
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:588
+#: nova/virt/xenapi/vmops.py:583
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:592
+#: nova/virt/xenapi/vmops.py:587
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:626
+#: nova/virt/xenapi/vmops.py:621
 #, python-format
 msgid "No opaque_ref could be determined for '%s'."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:680
+#: nova/virt/xenapi/vmops.py:675
 #, python-format
 msgid "Finished snapshot and upload for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vmops.py:683
 #, python-format
 msgid "Starting snapshot for VM %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:697
+#: nova/virt/xenapi/vmops.py:692
 #, python-format
 msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:716
+#: nova/virt/xenapi/vmops.py:708
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:784
+#: nova/virt/xenapi/vmops.py:776
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:907
+#: nova/virt/xenapi/vmops.py:898
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:915
+#: nova/virt/xenapi/vmops.py:906
 #, python-format
 msgid "Resize instance %s complete"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:946
+#: nova/virt/xenapi/vmops.py:935
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:966
+#: nova/virt/xenapi/vmops.py:955
 #, python-format
 msgid "domid changed from %(olddomid)s to %(newdomid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:982
+#: nova/virt/xenapi/vmops.py:971
 #, python-format
 msgid "Failed to update agent: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1005
+#: nova/virt/xenapi/vmops.py:994
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1021
+#: nova/virt/xenapi/vmops.py:1010
 #, python-format
 msgid "Failed to update password: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1048
+#: nova/virt/xenapi/vmops.py:1037
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1057
+#: nova/virt/xenapi/vmops.py:1046
 #, python-format
 msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1061
+#: nova/virt/xenapi/vmops.py:1050
 #, python-format
 msgid "Shutting down VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1080
+#: nova/virt/xenapi/vmops.py:1066
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1101
+#: nova/virt/xenapi/vmops.py:1090
 #, python-format
 msgid "Destroying VDIs for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1159
+#: nova/virt/xenapi/vmops.py:1145
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s using RAW or VHD, skipping kernel and ramdisk "
 "deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1166
+#: nova/virt/xenapi/vmops.py:1152
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1173
+#: nova/virt/xenapi/vmops.py:1159
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1185
+#: nova/virt/xenapi/vmops.py:1169
 #, python-format
 msgid "Instance %(instance_uuid)s VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1203
+#: nova/virt/xenapi/vmops.py:1187
 #, python-format
 msgid "Destroying VM for Instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1218
+#: nova/virt/xenapi/vmops.py:1208
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1272
+#: nova/virt/xenapi/vmops.py:1257
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1344
+#: nova/virt/xenapi/vmops.py:1329
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1348
+#: nova/virt/xenapi/vmops.py:1333
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1413
+#: nova/virt/xenapi/vmops.py:1398
 #, python-format
 msgid "Instance for migration %d not found, skipping"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1445
+#: nova/virt/xenapi/vmops.py:1428
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1496
+#: nova/virt/xenapi/vmops.py:1479
 #, python-format
 msgid "injecting network info to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1514
+#: nova/virt/xenapi/vmops.py:1497
 #, python-format
 msgid "creating vif(s) for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1523
+#: nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1526
+#: nova/virt/xenapi/vmops.py:1509
 #, python-format
 msgid "Created VIF %(vif_ref)s for VM %(vm_ref)s, network %(network_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1555
+#: nova/virt/xenapi/vmops.py:1538
 #, python-format
 msgid "injecting hostname to xs for vm: |%s|"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1617
+#: nova/virt/xenapi/vmops.py:1600
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1642
+#: nova/virt/xenapi/vmops.py:1622
 #, python-format
 msgid ""
 "TIMEOUT: The call to %(method)s timed out. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1646
+#: nova/virt/xenapi/vmops.py:1626
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. VM"
 " id=%(instance_uuid)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1651
+#: nova/virt/xenapi/vmops.py:1631
 #, python-format
 msgid ""
 "The call to %(method)s returned an error: %(e)s. VM id=%(instance_uuid)s;"
 " args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1837
+#: nova/virt/xenapi/vmops.py:1817
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6897,7 +6801,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:157
+#: nova/virt/xenapi/volumeops.py:156
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6914,7 +6818,7 @@ msgstr ""
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:51
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6937,160 +6841,146 @@ msgstr ""
 msgid "Unable to find SR from VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:206
-#, python-format
-msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:209
-#, python-format
-msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
-msgstr ""
-
-#: nova/virt/xenapi/volume_utils.py:228
+#: nova/virt/xenapi/volume_utils.py:204
 #, python-format
 msgid "Ignoring exception %(exc)s when getting PBDs for %(sr_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:234
+#: nova/virt/xenapi/volume_utils.py:210
 #, python-format
 msgid "Ignoring exception %(exc)s when unplugging PBD %(pbd)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:258
+#: nova/virt/xenapi/volume_utils.py:234
 #, python-format
 msgid "Unable to introduce VDI on SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:266
+#: nova/virt/xenapi/volume_utils.py:242
 #, python-format
 msgid "Unable to get record of VDI %s on"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:288
+#: nova/virt/xenapi/volume_utils.py:264
 #, python-format
 msgid "Unable to introduce VDI for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:298
+#: nova/virt/xenapi/volume_utils.py:274
 #, python-format
 msgid "Error finding vdis in SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:305
+#: nova/virt/xenapi/volume_utils.py:281
 #, python-format
 msgid "Unable to find vbd for vdi %s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:339
+#: nova/virt/xenapi/volume_utils.py:315
 #, python-format
 msgid "Unable to obtain target information %(data)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:365
+#: nova/virt/xenapi/volume_utils.py:341
 #, python-format
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:65
+#: nova/virt/xenapi/volumeops.py:64
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:71
-msgid "Error destroying VDI"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:74
+#: nova/virt/xenapi/volumeops.py:69
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:77
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:80
+#: nova/virt/xenapi/volumeops.py:76
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:81
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:88
+#: nova/virt/xenapi/volumeops.py:85
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:93
+#: nova/virt/xenapi/volumeops.py:90
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:97
+#: nova/virt/xenapi/volumeops.py:94
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:107
+#: nova/virt/xenapi/volumeops.py:106
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:113
+#: nova/virt/xenapi/volumeops.py:112
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:122
+#: nova/virt/xenapi/volumeops.py:121
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:179
+#: nova/virt/xenapi/volumeops.py:178
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "無法替 instance實例 %(instance_name)s , 建立 VDI 在SR %(sr_ref)s"
 
-#: nova/virt/xenapi/volumeops.py:192
+#: nova/virt/xenapi/volumeops.py:189
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "無法替 instance實例 %(instance_name)s ,  使用SR %(sr_ref)s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/xenapi/volumeops.py:203
+#: nova/virt/xenapi/volumeops.py:200
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:213
+#: nova/virt/xenapi/volumeops.py:210
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:221
+#: nova/virt/xenapi/volumeops.py:219
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "找不到Volume %s"
 
-#: nova/virt/xenapi/volumeops.py:229
+#: nova/virt/xenapi/volumeops.py:227
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "無法卸載 Volume %s"
 
-#: nova/virt/xenapi/volumeops.py:234
+#: nova/virt/xenapi/volumeops.py:232
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:239
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:243
+#: nova/virt/xenapi/volumeops.py:241
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 從虛擬機器 %(instance_name)s 卸載"
@@ -7130,7 +7020,7 @@ msgstr ""
 msgid "Starting nova-xvpvncproxy node (version %s)"
 msgstr ""
 
-#: nova/volume/api.py:74 nova/volume/api.py:210
+#: nova/volume/api.py:74 nova/volume/api.py:214
 msgid "status must be available"
 msgstr ""
 
@@ -7139,59 +7029,60 @@ msgstr ""
 msgid "Quota exceeded for %(pid)s, tried to create %(size)sG volume"
 msgstr ""
 
-#: nova/volume/api.py:133
-msgid "Volume status must be available"
+#: nova/volume/api.py:137
+#, fuzzy
+msgid "Volume status must be available or error"
 msgstr "Volume 狀態需要可被使用"
 
-#: nova/volume/api.py:213
+#: nova/volume/api.py:217
 msgid "already attached"
 msgstr ""
 
-#: nova/volume/api.py:220
+#: nova/volume/api.py:224
 msgid "already detached"
 msgstr ""
 
-#: nova/volume/api.py:282 nova/volume/api.py:315
+#: nova/volume/api.py:286 nova/volume/api.py:319
 msgid "must be available"
 msgstr ""
 
-#: nova/volume/driver.py:92
+#: nova/volume/driver.py:89
 #, python-format
 msgid "Recovering from a failed execute.  Try number %s"
 msgstr ""
 
-#: nova/volume/driver.py:102
+#: nova/volume/driver.py:99
 #, python-format
 msgid "volume group %s doesn't exist"
 msgstr ""
 
-#: nova/volume/driver.py:264 nova/volume/driver.py:866
+#: nova/volume/driver.py:263
 #, python-format
 msgid "Skipping ensure_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:312 nova/volume/driver.py:910
+#: nova/volume/driver.py:311
 #, python-format
 msgid "Skipping remove_export. No iscsi_target provisioned for volume: %d"
 msgstr ""
 
-#: nova/volume/driver.py:321
+#: nova/volume/driver.py:320
 #, python-format
 msgid ""
 "Skipping remove_export. No iscsi_target is presently exported for volume:"
 " %d"
 msgstr ""
 
-#: nova/volume/driver.py:331
+#: nova/volume/driver.py:330
 msgid "ISCSI provider_location not stored, using discovery"
 msgstr ""
 
-#: nova/volume/driver.py:378
+#: nova/volume/driver.py:377
 #, python-format
 msgid "Could not find iSCSI export  for volume %s"
 msgstr ""
 
-#: nova/volume/driver.py:382
+#: nova/volume/driver.py:381
 #, python-format
 msgid "ISCSI Discovery: Found %s"
 msgstr ""
@@ -7225,74 +7116,6 @@ msgstr ""
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/driver.py:709
-#, python-format
-msgid "\tVolume %s is NOT VSA volume"
-msgstr ""
-
-#: nova/volume/driver.py:725
-#, python-format
-msgid "\tFE VSA Volume %s creation - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:758
-#, python-format
-msgid "VSA BE create_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:761
-#, python-format
-msgid "VSA BE create_volume for %s succeeded"
-msgstr ""
-
-#: nova/volume/driver.py:769
-#, python-format
-msgid "\tFE VSA Volume %s deletion - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:780
-#, python-format
-msgid "VSA BE delete_volume for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:783
-#, python-format
-msgid "VSA BE delete_volume for %s suceeded"
-msgstr ""
-
-#: nova/volume/driver.py:843
-#, python-format
-msgid "\tFE VSA Volume %s local path call - call discover"
-msgstr ""
-
-#: nova/volume/driver.py:850 nova/volume/san.py:595
-msgid "local_path not supported"
-msgstr ""
-
-#: nova/volume/driver.py:858
-#, python-format
-msgid "\tFE VSA Volume %s ensure export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:882
-#, python-format
-msgid "\tFE VSA Volume %s create export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:902
-#, python-format
-msgid "\tFE VSA Volume %s remove export - do nothing"
-msgstr ""
-
-#: nova/volume/driver.py:922
-#, python-format
-msgid "VSA BE remove_export for %s failed"
-msgstr ""
-
-#: nova/volume/driver.py:974
-msgid "Failed to retrieve QoS info"
-msgstr ""
-
 #: nova/volume/manager.py:96
 #, python-format
 msgid "Re-exporting %s volumes"
@@ -7318,83 +7141,83 @@ msgstr ""
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:145
+#: nova/volume/manager.py:144
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:174
+#: nova/volume/manager.py:153
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:155
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:180
+#: nova/volume/manager.py:159
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:182
+#: nova/volume/manager.py:161
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:185
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:197
+#: nova/volume/manager.py:176
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:204
+#: nova/volume/manager.py:183
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:208
+#: nova/volume/manager.py:187
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:223
+#: nova/volume/manager.py:202
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:232
+#: nova/volume/manager.py:211
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:235
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:247
+#: nova/volume/manager.py:226
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:310
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:333
+#: nova/volume/manager.py:314
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:344
+#: nova/volume/manager.py:325
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:348
+#: nova/volume/manager.py:329
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7460,102 +7283,106 @@ msgstr ""
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:114 nova/volume/san.py:152
+#: nova/volume/san.py:113 nova/volume/san.py:151
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:157
+#: nova/volume/san.py:156
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:321
+#: nova/volume/san.py:320
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:453
+#: nova/volume/san.py:452
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:459
+#: nova/volume/san.py:458
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:467
+#: nova/volume/san.py:466
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:497
+#: nova/volume/san.py:496
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:550
+#: nova/volume/san.py:549
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:627
+#: nova/volume/san.py:594
+msgid "local_path not supported"
+msgstr ""
+
+#: nova/volume/san.py:626
 #, python-format
 msgid "Could not determine project for volume %s, can't export"
 msgstr ""
 
-#: nova/volume/san.py:697
+#: nova/volume/san.py:696
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:714
+#: nova/volume/san.py:713
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:719
+#: nova/volume/san.py:718
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:733
+#: nova/volume/san.py:732
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:747
+#: nova/volume/san.py:746
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:805
+#: nova/volume/san.py:804
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:847
+#: nova/volume/san.py:846
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:862
+#: nova/volume/san.py:861
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:881
+#: nova/volume/san.py:880
 #, python-format
 msgid "Deleting volumeID: %s "
 msgstr ""
 
-#: nova/volume/san.py:889
+#: nova/volume/san.py:888
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:892
+#: nova/volume/san.py:891
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:896
+#: nova/volume/san.py:895
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7634,11 +7461,11 @@ msgstr ""
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:211
+#: nova/volume/xensm.py:210
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:222
+#: nova/volume/xensm.py:221
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7719,144 +7546,103 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
-#: nova/vsa/api.py:82
-msgid "invalid drive data"
-msgstr ""
+#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgstr ""
 
-#: nova/vsa/api.py:105
-msgid "drive_name not defined"
-msgstr ""
+#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:111
-#, python-format
-msgid "invalid drive type name %s"
-msgstr ""
+#~ msgid "Nova access parameters were not specified."
+#~ msgstr ""
 
-#: nova/vsa/api.py:155
-msgid "*** Experimental VSA code ***"
-msgstr ""
+#~ msgid "Virtual Storage Array %(id)d could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:158 nova/vsa/api.py:303
-#, python-format
-msgid "Requested number of VCs (%d) is too high. Setting to default"
-msgstr ""
+#~ msgid "Virtual Storage Array %(name)s could not be found."
+#~ msgstr ""
 
-#: nova/vsa/api.py:194
-#, python-format
-msgid "Creating VSA: %s"
-msgstr ""
+#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:241
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d %(vsa_name)s: Create volume %(vol_name)s, %(vol_size)d "
-"GB, type %(vol_type_id)s"
-msgstr ""
+#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgstr ""
 
-#: nova/vsa/api.py:272
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab semaphore \"%(lock)s\" "
+#~ "for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:287
-#, python-format
-msgid "VSA ID %(vsa_id)d: Update VSA call"
-msgstr ""
+#~ msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:318
-#, python-format
-msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
-msgstr ""
+#~ msgid ""
+#~ "Attempting to grab file lock "
+#~ "\"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:324
-#, python-format
-msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
-msgstr ""
+#~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
+#~ msgstr ""
 
-#: nova/vsa/api.py:351
-#, python-format
-msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "No body provided"
+#~ msgstr ""
 
-#: nova/vsa/api.py:355
-#, python-format
-msgid "Unable to delete volume %s"
-msgstr ""
+#~ msgid "Create VSA %(display_name)s of type %(vc_type)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:357
-#, python-format
-msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
-msgstr ""
+#~ msgid "Delete VSA with id: %s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:363
-#, python-format
-msgid "Going to try to terminate VSA ID %s"
-msgstr ""
+#~ msgid "Associate address %(ip)s to VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/api.py:374
-#, python-format
-msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
-msgstr ""
+#~ msgid "Disassociate address from VSA %(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:73
-#, python-format
-msgid "Create call received for VSA %s"
-msgstr ""
+#~ msgid "%(obj)s with ID %(id)s not found"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:80 nova/vsa/manager.py:107
-#, python-format
-msgid "Failed to find VSA %(vsa_id)d"
-msgstr ""
+#~ msgid ""
+#~ "%(obj)s with ID %(id)s belongs to "
+#~ "VSA %(own_vsa_id)s and not to VSA "
+#~ "%(vsa_id)s."
+#~ msgstr ""
 
-#: nova/vsa/manager.py:89
-#, python-format
-msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
-msgstr ""
+#~ msgid "Index. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:100
-#, python-format
-msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
-msgstr ""
+#~ msgid "Detail. vsa_id=%(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:114
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Not all volumes are created (%(cvol_real)d of "
-"%(cvol_exp)d)"
-msgstr ""
+#~ msgid "Create. vsa_id=%(vsa_id)s, body=%(body)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:137
-#, python-format
-msgid ""
-"VSA ID %(vsa_id)d: Drive %(vol_name)s (%(vol_disp_name)s) is in "
-"%(status)s state"
-msgstr ""
+#~ msgid "Create volume of %(size)s GB from VSA ID %(vsa_id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:146
-#, python-format
-msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
-msgstr ""
+#~ msgid "Update %(obj)s with id: %(id)s, changes: %(changes)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:153
-#, python-format
-msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
-msgstr ""
+#~ msgid "Delete. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#: nova/vsa/manager.py:168
-#, python-format
-msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
-msgstr ""
+#~ msgid "Show. vsa_id=%(vsa_id)s, id=%(id)s"
+#~ msgstr ""
 
-#~ msgid "Unable to locate account %(account_name) on Solidfire device"
+#~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
-#~ msgid "Zone %(zone_id)s could not be found."
+#~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
-#~ msgid "Detected more than one volume with name %(vol_name)"
+#~ msgid ""
+#~ "Instance quota exceeded. You cannot run"
+#~ " any more instances of this type."
 #~ msgstr ""
 
-#~ msgid "Detected existing vlan with id %(vlan)"
+#~ msgid ""
+#~ "Instance quota exceeded. You can only"
+#~ " run %s more instances of this "
+#~ "type."
 #~ msgstr ""
 
 #~ msgid "Going to try to soft delete %s"
@@ -7875,6 +7661,25 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "Going to force the deletion of the"
+#~ " vm %(instance_uuid)s, even if it is"
+#~ " deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Instance %(instance_uuid)s did not exist "
+#~ "in the DB, but I will shut "
+#~ "it down anyway using a special "
+#~ "context"
+#~ msgstr ""
+
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr ""
+
+#~ msgid "trying to destroy already destroyed instance: %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7886,12 +7691,148 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "Instance %(instance_id)s not found"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
+#~ msgid "No fixed IPs to deallocate for vif %sid"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of memory(host:%(avail)s <= "
+#~ "instance:%(mem_inst)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to migrate %(instance_id)s to "
+#~ "%(dest)s: Lack of disk(host:%(available)s <="
+#~ " instance:%(necessary)s)"
+#~ msgstr ""
+
+#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
+#~ msgstr ""
+
+#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
+#~ msgstr ""
+
+#~ msgid "_filter_hosts: %(request_spec)s"
+#~ msgstr ""
+
+#~ msgid "Filter hosts for drive type %s"
+#~ msgstr ""
+
+#~ msgid "Host %s has no free capacity. Skip"
+#~ msgstr ""
+
+#~ msgid "Filter hosts: %s"
+#~ msgstr ""
+
+#~ msgid "Must implement host selection mechanism"
+#~ msgstr ""
+
+#~ msgid "Maximum number of hosts selected (%d)"
+#~ msgstr ""
+
+#~ msgid "Selected excessive host %(host)s"
+#~ msgstr ""
+
+#~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "volume_params %(volume_params)s"
+#~ msgstr ""
+
+#~ msgid "%(i)d: Volume %(name)s"
+#~ msgstr ""
+
+#~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
+#~ msgstr ""
+
+#~ msgid "Error creating volumes"
+#~ msgstr ""
+
+#~ msgid "Non-VSA volume %d"
+#~ msgstr ""
+
+#~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
+#~ msgstr ""
+
+#~ msgid "Error creating volume"
+#~ msgstr ""
+
+#~ msgid "No capability selected for volume of size %(size)s"
+#~ msgstr ""
+
+#~ msgid "Host %s:"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
+#~ "used %(used)2s, free %(free)2s. Available "
+#~ "capacity %(avail)-5s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t LeastUsedHost: Best host: %(best_host)s."
+#~ " (used capacity %(min_used)s)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "\t MostAvailCap: Best host: %(best_host)s. "
+#~ "(available %(max_avail)s %(type_str)s)"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate wrong VSA name. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: Emulate DB error. Raise"
+#~ msgstr ""
+
+#~ msgid "Test: user_data = %s"
+#~ msgstr ""
+
+#~ msgid "_create: param=%s"
+#~ msgstr ""
+
+#~ msgid "Host %s"
+#~ msgstr ""
+
+#~ msgid "Test: provision vol %(name)s on host %(host)s"
+#~ msgstr ""
+
+#~ msgid "\t vol=%(vol)s"
+#~ msgstr ""
+
+#~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume create: %s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get request: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
+#~ msgstr ""
+
+#~ msgid "Test: Volume get: id=%(volume_id)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
+#~ msgstr ""
+
+#~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
+#~ msgstr ""
+
 #~ msgid "Unable to get updated status: %s"
 #~ msgstr ""
 
@@ -7900,6 +7841,15 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "virsh said: %r"
+#~ msgstr ""
+
+#~ msgid "cool, it's a device"
+#~ msgstr ""
+
+#~ msgid "Unable to read LXC console"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
@@ -7909,12 +7859,73 @@ msgstr ""
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): image "
+#~ "verification skipped, no hash stored"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
+#~ " on this node %(local)d local, "
+#~ "%(remote)d on other nodes"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
+#~ "-- an absent base file is in "
+#~ "use! instances: %(instance_list)s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
 #~ " other nodes (%(remote)d on other "
 #~ "nodes)"
 #~ msgstr ""
 
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
+#~ msgstr ""
+
+#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
+#~ msgstr ""
+
+#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Created a CDROM-specific VBD %(vbd_ref)s"
+#~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s ... "
+#~ msgstr ""
+
+#~ msgid "Creating VBD for VDI %s done."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful first time."
+#~ msgstr ""
+
+#~ msgid "VBD.unplug rejected: retrying..."
+#~ msgstr ""
+
+#~ msgid "Not sleeping anymore!"
+#~ msgstr ""
+
+#~ msgid "VBD.unplug successful eventually."
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
+#~ msgstr ""
+
+#~ msgid "Ignoring XenAPI.Failure %s"
+#~ msgstr ""
+
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr ""
 
@@ -7930,3 +7941,130 @@ msgstr ""
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 #~ msgstr ""
 
+#~ msgid "Creating VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
+#~ msgstr ""
+
+#~ msgid "Error destroying VDI"
+#~ msgstr ""
+
+#~ msgid "\tVolume %s is NOT VSA volume"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s creation - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE create_volume for %s succeeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s deletion - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s failed"
+#~ msgstr ""
+
+#~ msgid "VSA BE delete_volume for %s suceeded"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s local path call - call discover"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s ensure export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s create export - do nothing"
+#~ msgstr ""
+
+#~ msgid "\tFE VSA Volume %s remove export - do nothing"
+#~ msgstr ""
+
+#~ msgid "VSA BE remove_export for %s failed"
+#~ msgstr ""
+
+#~ msgid "Failed to retrieve QoS info"
+#~ msgstr ""
+
+#~ msgid "invalid drive data"
+#~ msgstr ""
+
+#~ msgid "drive_name not defined"
+#~ msgstr ""
+
+#~ msgid "invalid drive type name %s"
+#~ msgstr ""
+
+#~ msgid "*** Experimental VSA code ***"
+#~ msgstr ""
+
+#~ msgid "Requested number of VCs (%d) is too high. Setting to default"
+#~ msgstr ""
+
+#~ msgid "Creating VSA: %s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d %(vsa_name)s: Create "
+#~ "volume %(vol_name)s, %(vol_size)d GB, type "
+#~ "%(vol_type_id)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA status to %(status)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Update VSA call"
+#~ msgstr ""
+
+#~ msgid "Adding %(add_cnt)s VCs to VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "Deleting %(del_cnt)s VCs from VSA %(vsa_name)s."
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Deleting %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Unable to delete volume %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Forced delete. %(direction)s volume %(vol_name)s"
+#~ msgstr ""
+
+#~ msgid "Going to try to terminate VSA ID %s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Delete instance %(name)s"
+#~ msgstr ""
+
+#~ msgid "Create call received for VSA %s"
+#~ msgstr ""
+
+#~ msgid "Failed to find VSA %(vsa_id)d"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)s: Drive %(vol_id)s created. Status %(status)s"
+#~ msgstr ""
+
+#~ msgid "Drive %(vol_name)s (%(vol_disp_name)s) still in creating phase - wait"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Not all volumes "
+#~ "are created (%(cvol_real)d of %(cvol_exp)d)"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VSA ID %(vsa_id)d: Drive %(vol_name)s "
+#~ "(%(vol_disp_name)s) is in %(status)s state"
+#~ msgstr ""
+
+#~ msgid "Failed to update attach status for volume %(vol_name)s. %(ex)s"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Delete all BE volumes"
+#~ msgstr ""
+
+#~ msgid "VSA ID %(vsa_id)d: Start %(vc_count)d instances"
+#~ msgstr ""
+