From cd4b21839be29bbc7d62875370fcd5163ec4c2dc Mon Sep 17 00:00:00 2001
From: OpenStack Jenkins <jenkins@openstack.org>
Date: Mon, 11 Feb 2013 00:02:39 +0000
Subject: Imported Translations from Transifex

Change-Id: I50ee55cb39464f83d414110f3604cd7740c2648c
---
 nova/locale/nova.pot | 1672 ++++++++++++++++++++++++++------------------------
 1 file changed, 855 insertions(+), 817 deletions(-)

diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 34a2f934a..567ba7de8 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nova 2013.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-02-07 00:04+0000\n"
+"POT-Creation-Date: 2013-02-11 00:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -101,259 +101,259 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:168
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:172
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:176
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:180
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:185
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:204
+#: nova/exception.py:190
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:209
+#: nova/exception.py:195
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:213
+#: nova/exception.py:199
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:217
+#: nova/exception.py:203
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:221
+#: nova/exception.py:207
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:211
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:230
+#: nova/exception.py:216
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:234
+#: nova/exception.py:220
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:239
+#: nova/exception.py:225
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:244
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:248 nova/api/ec2/cloud.py:461
-#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2603
+#: nova/exception.py:234 nova/api/ec2/cloud.py:461
+#: nova/api/openstack/compute/contrib/keypairs.py:98 nova/compute/api.py:2628
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:252
+#: nova/exception.py:238
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:256
+#: nova/exception.py:242
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:260
+#: nova/exception.py:246
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1339
+#: nova/exception.py:250 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:268
+#: nova/exception.py:254
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:272
+#: nova/exception.py:258
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:276 nova/api/ec2/cloud.py:615
+#: nova/exception.py:262 nova/api/ec2/cloud.py:615
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:280
+#: nova/exception.py:266
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:284
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:288
+#: nova/exception.py:274 nova/openstack/common/db/sqlalchemy/session.py:353
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:295
+#: nova/exception.py:281
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:299
+#: nova/exception.py:285
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:304
+#: nova/exception.py:290
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:308
+#: nova/exception.py:294 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:312
+#: nova/exception.py:298
 #, 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:317
+#: nova/exception.py:303
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:321
+#: nova/exception.py:307
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:325
+#: nova/exception.py:311
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:329
+#: nova/exception.py:315
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:333
+#: nova/exception.py:319
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:337
+#: nova/exception.py:323
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:341
+#: nova/exception.py:327
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:345
+#: nova/exception.py:331
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:349
+#: nova/exception.py:335
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:353
+#: nova/exception.py:339
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:357
+#: nova/exception.py:343
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:361
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:365
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:370
+#: nova/exception.py:356
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:374
+#: nova/exception.py:360
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:379
+#: nova/exception.py:365
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:384
+#: nova/exception.py:370
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:388
+#: nova/exception.py:374
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:392
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:396
+#: nova/exception.py:382
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:400
+#: nova/exception.py:386
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:404
+#: nova/exception.py:390
 #, 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:410
+#: nova/exception.py:396
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -361,85 +361,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:403
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:421
+#: nova/exception.py:407
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:425
+#: nova/exception.py:411
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:429
+#: nova/exception.py:415
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:433
+#: nova/exception.py:419
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:437
+#: nova/exception.py:423
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: nova/exception.py:441
+#: nova/exception.py:427
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:446
+#: nova/exception.py:432
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:451
+#: nova/exception.py:437
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:455
+#: nova/exception.py:441
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:459
+#: nova/exception.py:445
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:463
+#: nova/exception.py:449
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:467
+#: nova/exception.py:453
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:457
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:461
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:465
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:483
+#: nova/exception.py:469
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -447,748 +447,748 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:476
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:494
+#: nova/exception.py:480
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:498
+#: nova/exception.py:484
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:502
+#: nova/exception.py:488
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:506
+#: nova/exception.py:492
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:510
+#: nova/exception.py:496
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:514
+#: nova/exception.py:500
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:518
+#: nova/exception.py:504
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:522
+#: nova/exception.py:508
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:526
+#: nova/exception.py:512
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:530
+#: nova/exception.py:516
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:534
+#: nova/exception.py:520
 #, 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:539
+#: nova/exception.py:525
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:543
+#: nova/exception.py:529
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:547
+#: nova/exception.py:533
 #, python-format
 msgid "Port %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:551
+#: nova/exception.py:537
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:555
+#: nova/exception.py:541
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:559
+#: nova/exception.py:545
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:563
+#: nova/exception.py:549
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:567
+#: nova/exception.py:553
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:571
+#: nova/exception.py:557
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:576
+#: nova/exception.py:562
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:580
+#: nova/exception.py:566
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:585
+#: nova/exception.py:571
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:576
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:595
+#: nova/exception.py:581
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:585
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:589
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:598
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:602
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:606
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:610
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:614
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:618
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:622
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:641
+#: nova/exception.py:627
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:646
+#: nova/exception.py:632
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:650
+#: nova/exception.py:636
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:654
+#: nova/exception.py:640
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:658
+#: nova/exception.py:644
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:662
+#: nova/exception.py:648
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:666
+#: nova/exception.py:652
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:670
+#: nova/exception.py:656
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:674
+#: nova/exception.py:660
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:678
+#: nova/exception.py:664
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:682
+#: nova/exception.py:668
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:686
+#: nova/exception.py:672
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:690
+#: nova/exception.py:676
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:694
+#: nova/exception.py:680
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:699
+#: nova/exception.py:685
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:703
+#: nova/exception.py:689
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:707
+#: nova/exception.py:693
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:711
+#: nova/exception.py:697
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:715
+#: nova/exception.py:701
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:719
+#: nova/exception.py:705
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:723
+#: nova/exception.py:709
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:727
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:717
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:736
+#: nova/exception.py:722
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:726
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:745
+#: nova/exception.py:731
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:750
+#: nova/exception.py:736
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:740
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:759
+#: nova/exception.py:745
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:749
 #, 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:769
+#: nova/exception.py:755
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:773
+#: nova/exception.py:759
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:777
+#: nova/exception.py:763
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:782
+#: nova/exception.py:768
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:795
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:785
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:804
+#: nova/exception.py:790
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:808
+#: nova/exception.py:794
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:798
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:802
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:820
+#: nova/exception.py:806
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:824
+#: nova/exception.py:810
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:828
+#: nova/exception.py:814
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:832
+#: nova/exception.py:818
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:836
+#: nova/exception.py:822
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:826
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:831
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:835
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:854
+#: nova/exception.py:840
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:859
+#: nova/exception.py:845
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:864
+#: nova/exception.py:850
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:868
+#: nova/exception.py:854
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:872
+#: nova/exception.py:858
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:863
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:867
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:871
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:875
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:879
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:883
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:887
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:891
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:909
+#: nova/exception.py:895
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:899
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:904
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:908
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:912
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:916
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:936
+#: nova/exception.py:922
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:940
+#: nova/exception.py:926
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:944
+#: nova/exception.py:930
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:948
+#: nova/exception.py:934
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:938
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:942
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:946
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:950
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:954
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:958
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:962
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:969
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:974
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:978
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:982
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:986
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:990
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:994
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:998
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1002
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1007
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1011
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1015
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1019
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1038
+#: nova/exception.py:1024
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1042
+#: nova/exception.py:1028
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1046
+#: nova/exception.py:1032
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1052
+#: nova/exception.py:1038
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1056
+#: nova/exception.py:1042
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1060
+#: nova/exception.py:1046
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1064
+#: nova/exception.py:1050
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1068
+#: nova/exception.py:1054
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1058
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1062
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1080
+#: nova/exception.py:1066
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1084
+#: nova/exception.py:1070
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1089
+#: nova/exception.py:1075
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1080
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1100
+#: nova/exception.py:1086
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1104
+#: nova/exception.py:1090
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1109
+#: nova/exception.py:1095
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1100
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1104
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1108
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1112
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
@@ -1356,98 +1356,98 @@ msgstr ""
 msgid "serve() can only be called once"
 msgstr ""
 
-#: nova/utils.py:193
+#: nova/utils.py:196
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:204
+#: nova/utils.py:207
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:228 nova/utils.py:306 nova/virt/powervm/common.py:83
+#: nova/utils.py:231 nova/utils.py:309 nova/virt/powervm/common.py:83
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:241
+#: nova/utils.py:244
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:281
+#: nova/utils.py:284
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:283
+#: nova/utils.py:286
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:287
+#: nova/utils.py:290
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:322
+#: nova/utils.py:325
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:484
+#: nova/utils.py:487
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:487
+#: nova/utils.py:490
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:526
+#: nova/utils.py:529
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:598
+#: nova/utils.py:601
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: nova/utils.py:633
+#: nova/utils.py:636
 #, python-format
 msgid "Periodic task processor sleeping for %.02f seconds"
 msgstr ""
 
-#: nova/utils.py:640
+#: nova/utils.py:643
 msgid "in dynamic looping call"
 msgstr ""
 
-#: nova/utils.py:694
+#: nova/utils.py:697
 #, python-format
 msgid "Unknown byte multiplier: %s"
 msgstr ""
 
-#: nova/utils.py:823
+#: nova/utils.py:826
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:852
+#: nova/utils.py:855
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:974
+#: nova/utils.py:978
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1040
+#: nova/utils.py:1044
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1172 nova/virt/configdrive.py:176
+#: nova/utils.py:1176 nova/virt/configdrive.py:176
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
@@ -2150,6 +2150,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/evacuate.py:49
 msgid "Malformed request body"
 msgstr ""
 
@@ -2290,10 +2291,10 @@ msgid "Flavor '%s' could not be found "
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:560
-#: nova/api/openstack/compute/servers.py:739
-#: nova/api/openstack/compute/servers.py:1011
-#: nova/api/openstack/compute/servers.py:1117
-#: nova/api/openstack/compute/servers.py:1290
+#: nova/api/openstack/compute/servers.py:738
+#: nova/api/openstack/compute/servers.py:1010
+#: nova/api/openstack/compute/servers.py:1116
+#: nova/api/openstack/compute/servers.py:1289
 msgid "Instance could not be found"
 msgstr ""
 
@@ -2325,198 +2326,198 @@ msgstr ""
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:610
+#: nova/api/openstack/compute/servers.py:609
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:641
+#: nova/api/openstack/compute/servers.py:640
 msgid "Unknown argment : port"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:644
+#: nova/api/openstack/compute/servers.py:643
 #, python-format
 msgid "Bad port format: port uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:654
+#: nova/api/openstack/compute/servers.py:653
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:664
+#: nova/api/openstack/compute/servers.py:663
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:677
+#: nova/api/openstack/compute/servers.py:676
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:683
+#: nova/api/openstack/compute/servers.py:682
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:686
+#: nova/api/openstack/compute/servers.py:685
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:712
+#: nova/api/openstack/compute/servers.py:711
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:719
+#: nova/api/openstack/compute/servers.py:718
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:726
+#: nova/api/openstack/compute/servers.py:725
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:755
+#: nova/api/openstack/compute/servers.py:754
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:803
-#: nova/api/openstack/compute/servers.py:917
+#: nova/api/openstack/compute/servers.py:802
+#: nova/api/openstack/compute/servers.py:916
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:844
+#: nova/api/openstack/compute/servers.py:843
 msgid "min_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:847
+#: nova/api/openstack/compute/servers.py:846
 msgid "min_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:853
+#: nova/api/openstack/compute/servers.py:852
 msgid "max_count must be an integer value"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:856
+#: nova/api/openstack/compute/servers.py:855
 msgid "max_count must be > 0"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:860
+#: nova/api/openstack/compute/servers.py:859
 msgid "min_count must be <= max_count"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:912
+#: nova/api/openstack/compute/servers.py:911
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:920
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:999
+#: nova/api/openstack/compute/servers.py:998
 msgid "HostId cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1003
+#: nova/api/openstack/compute/servers.py:1002
 msgid "Personality cannot be updated."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1029
-#: nova/api/openstack/compute/servers.py:1049
+#: nova/api/openstack/compute/servers.py:1028
+#: nova/api/openstack/compute/servers.py:1048
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1035
+#: nova/api/openstack/compute/servers.py:1034
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1052
+#: nova/api/openstack/compute/servers.py:1051
 msgid "Flavor used by the instance could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1058
+#: nova/api/openstack/compute/servers.py:1057
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1071
+#: nova/api/openstack/compute/servers.py:1070
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1075
+#: nova/api/openstack/compute/servers.py:1074
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1088
+#: nova/api/openstack/compute/servers.py:1087
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/servers.py:1099
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1103
+#: nova/api/openstack/compute/servers.py:1102
 msgid "Resize requires a flavor change."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1127
+#: nova/api/openstack/compute/servers.py:1126
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1136
+#: nova/api/openstack/compute/servers.py:1135
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1163
+#: nova/api/openstack/compute/servers.py:1162
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1176
+#: nova/api/openstack/compute/servers.py:1175
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1180
-#: nova/api/openstack/compute/servers.py:1387
+#: nova/api/openstack/compute/servers.py:1179
+#: nova/api/openstack/compute/servers.py:1386
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1186
+#: nova/api/openstack/compute/servers.py:1185
 msgid "Unable to set password on instance"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1195
+#: nova/api/openstack/compute/servers.py:1194
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1208
+#: nova/api/openstack/compute/servers.py:1207
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1211
+#: nova/api/openstack/compute/servers.py:1210
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1229
+#: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
 #: nova/api/openstack/compute/contrib/coverage_ext.py:256
 #: nova/api/openstack/compute/contrib/keypairs.py:78
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1235
+#: nova/api/openstack/compute/servers.py:1234
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1297
+#: nova/api/openstack/compute/servers.py:1296
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1330
+#: nova/api/openstack/compute/servers.py:1329
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1414
+#: nova/api/openstack/compute/servers.py:1413
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2760,6 +2761,23 @@ msgstr ""
 msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
+#: nova/api/openstack/compute/contrib/evacuate.py:43
+msgid "Instance evacuate is admin only functionality"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:60
+msgid "admin password can't be changed on existing disk"
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:68
+msgid "host and onSharedStorage must be specified."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/evacuate.py:79
+#, python-format
+msgid "Error in evacuate, %s"
+msgstr ""
+
 #: nova/api/openstack/compute/contrib/fixed_ips.py:42
 #, python-format
 msgid "Fixed IP %s has been deleted"
@@ -2770,16 +2788,16 @@ msgstr ""
 msgid "Fixed IP %s not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavor_access.py:80
-#: nova/api/openstack/compute/contrib/flavor_access.py:104
+#: nova/api/openstack/compute/contrib/flavor_access.py:76
+#: nova/api/openstack/compute/contrib/flavor_access.py:100
 msgid "Flavor not found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavor_access.py:109
+#: nova/api/openstack/compute/contrib/flavor_access.py:105
 msgid "Access list not available for public flavors."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/flavor_access.py:121
+#: nova/api/openstack/compute/contrib/flavor_access.py:117
 msgid "No request body"
 msgstr ""
 
@@ -2905,23 +2923,23 @@ msgstr ""
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hypervisors.py:184
-#: nova/api/openstack/compute/contrib/hypervisors.py:195
+#: nova/api/openstack/compute/contrib/hypervisors.py:185
+#: nova/api/openstack/compute/contrib/hypervisors.py:196
 #, python-format
 msgid "Hypervisor with ID '%s' could not be found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hypervisors.py:203
+#: nova/api/openstack/compute/contrib/hypervisors.py:204
 msgid "Virt driver does not implement uptime function."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hypervisors.py:218
-#: nova/api/openstack/compute/contrib/hypervisors.py:232
+#: nova/api/openstack/compute/contrib/hypervisors.py:220
+#: nova/api/openstack/compute/contrib/hypervisors.py:230
 #, python-format
 msgid "No hypervisor matching '%s' could be found."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/instance_usage_audit_log.py:55
+#: nova/api/openstack/compute/contrib/instance_usage_audit_log.py:57
 #, python-format
 msgid "Invalid timestamp for date %s"
 msgstr ""
@@ -3159,54 +3177,54 @@ msgstr ""
 msgid "Error waiting for responses from neighbor cells: %(exc)s"
 msgstr ""
 
-#: nova/cells/messaging.py:631
+#: nova/cells/messaging.py:647
 #, python-format
 msgid "Unknown method '%(method)s' in compute API"
 msgstr ""
 
-#: nova/cells/messaging.py:654
+#: nova/cells/messaging.py:670
 #, python-format
 msgid "Received capabilities from child cell %(cell_name)s: %(capabilities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:663
+#: nova/cells/messaging.py:679
 #, python-format
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:737
+#: nova/cells/messaging.py:759
 #, python-format
 msgid "Got update for instance %(instance_uuid)s: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:760
+#: nova/cells/messaging.py:782
 #, python-format
 msgid "Got update to delete instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/cells/messaging.py:775
+#: nova/cells/messaging.py:797
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:789
+#: nova/cells/messaging.py:811
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:810
+#: nova/cells/messaging.py:832
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:974
+#: nova/cells/messaging.py:1009
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:994
+#: nova/cells/messaging.py:1029
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3263,14 +3281,6 @@ msgstr ""
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/common/sqlalchemyutils.py:68
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: nova/common/sqlalchemyutils.py:116
-msgid "Unknown sort direction, must be 'desc' or 'asc'"
-msgstr ""
-
 #: nova/compute/api.py:264
 msgid "Cannot run any more instances of this type."
 msgstr ""
@@ -3413,78 +3423,78 @@ msgid ""
 "was up."
 msgstr ""
 
-#: nova/compute/api.py:2576
+#: nova/compute/api.py:2601
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2580
+#: nova/compute/api.py:2605
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2681
+#: nova/compute/api.py:2706
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2684
+#: nova/compute/api.py:2709
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2692
+#: nova/compute/api.py:2717
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2698
+#: nova/compute/api.py:2723
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2718
+#: nova/compute/api.py:2743
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2721
+#: nova/compute/api.py:2746
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2728
+#: nova/compute/api.py:2753
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2793
+#: nova/compute/api.py:2818
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:2801
+#: nova/compute/api.py:2826
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:2804
+#: nova/compute/api.py:2829
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3061
+#: nova/compute/api.py:3087
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3070
+#: nova/compute/api.py:3096
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3073
+#: nova/compute/api.py:3099
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3084
+#: nova/compute/api.py:3110
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
@@ -3543,585 +3553,589 @@ msgid ""
 "%(requested)d %(unit)s"
 msgstr ""
 
-#: nova/compute/instance_types.py:91
+#: nova/compute/instance_types.py:92
 msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr ""
 
-#: nova/compute/instance_types.py:100
+#: nova/compute/instance_types.py:101
 #, python-format
 msgid "'%s' argument must be a positive integer"
 msgstr ""
 
-#: nova/compute/instance_types.py:108
+#: nova/compute/instance_types.py:109
 msgid "'rxtx_factor' argument must be a positive float"
 msgstr ""
 
-#: nova/compute/instance_types.py:116
+#: nova/compute/instance_types.py:117
 #, python-format
 msgid "'%s' argument must be greater than 0"
 msgstr ""
 
-#: nova/compute/instance_types.py:126
+#: nova/compute/instance_types.py:127
 msgid "is_public must be a boolean"
 msgstr ""
 
-#: nova/compute/instance_types.py:133
+#: nova/compute/instance_types.py:134
 #, python-format
 msgid "DB error: %s"
 msgstr ""
 
-#: nova/compute/instance_types.py:143
+#: nova/compute/instance_types.py:144
 #, python-format
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:191
+#: nova/compute/manager.py:192
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:343
+#: nova/compute/manager.py:344
 #, python-format
 msgid "%(nodename)s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:372
+#: nova/compute/manager.py:373
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:391
+#: nova/compute/manager.py:392
 #, python-format
 msgid "Instance %(uuid)s found in the hypervisor, but not in the database"
 msgstr ""
 
-#: nova/compute/manager.py:409
+#: nova/compute/manager.py:410
 #, python-format
 msgid ""
 "Instance %(driver_instance)s found in the hypervisor, but not in the "
 "database"
 msgstr ""
 
-#: nova/compute/manager.py:430
+#: nova/compute/manager.py:431
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:457
+#: nova/compute/manager.py:458
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:469
+#: nova/compute/manager.py:470
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:483
+#: nova/compute/manager.py:484
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:488
+#: nova/compute/manager.py:489
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:498
+#: nova/compute/manager.py:499
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:532
+#: nova/compute/manager.py:533
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:607
+#: nova/compute/manager.py:608
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:681 nova/compute/manager.py:1992
+#: nova/compute/manager.py:682 nova/compute/manager.py:1997
 #, python-format
 msgid "No node specified, defaulting to %(node)s"
 msgstr ""
 
-#: nova/compute/manager.py:724
+#: nova/compute/manager.py:725
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:749
+#: nova/compute/manager.py:750
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:784 nova/compute/manager.py:2046
+#: nova/compute/manager.py:785 nova/compute/manager.py:2051
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:802
+#: nova/compute/manager.py:803
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:807
+#: nova/compute/manager.py:808
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:814
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:841
+#: nova/compute/manager.py:842
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:917
+#: nova/compute/manager.py:918
 #, 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:923
+#: nova/compute/manager.py:924
 #, 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:933
+#: nova/compute/manager.py:934
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:955
+#: nova/compute/manager.py:956
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:959
+#: nova/compute/manager.py:960
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:969
+#: nova/compute/manager.py:970
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:986
+#: nova/compute/manager.py:987
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1010
+#: nova/compute/manager.py:1011
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1083
+#: nova/compute/manager.py:1087
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1114
+#: nova/compute/manager.py:1118
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1117
+#: nova/compute/manager.py:1121
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1124
+#: nova/compute/manager.py:1128
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1149
+#: nova/compute/manager.py:1153
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1188 nova/compute/manager.py:2225
-#: nova/compute/manager.py:3601
+#: nova/compute/manager.py:1192 nova/compute/manager.py:2230
+#: nova/compute/manager.py:3612
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1328
+#: nova/compute/manager.py:1332
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1341
+#: nova/compute/manager.py:1345
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1345
+#: nova/compute/manager.py:1349
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1349
+#: nova/compute/manager.py:1353
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1433
+#: nova/compute/manager.py:1437
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1457
+#: nova/compute/manager.py:1461
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1476
+#: nova/compute/manager.py:1480
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1485
+#: nova/compute/manager.py:1490
 #, python-format
 msgid "Cannot reboot instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:1521
+#: nova/compute/manager.py:1526
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1527
+#: nova/compute/manager.py:1532
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1588
+#: nova/compute/manager.py:1593
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1595
+#: nova/compute/manager.py:1600
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1600
+#: nova/compute/manager.py:1605
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1628
+#: nova/compute/manager.py:1633
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1635
+#: nova/compute/manager.py:1640
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1642
+#: nova/compute/manager.py:1647
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:1657
+#: nova/compute/manager.py:1662
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1664
+#: nova/compute/manager.py:1669
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1677
+#: nova/compute/manager.py:1682
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: "
 "%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1681
+#: nova/compute/manager.py:1686
 #, python-format
 msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1701
+#: nova/compute/manager.py:1706
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:1715
+#: nova/compute/manager.py:1720
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1750
+#: nova/compute/manager.py:1755
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1771
+#: nova/compute/manager.py:1776
 #, python-format
 msgid "Changing instance metadata according to %(diff)r"
 msgstr ""
 
-#: nova/compute/manager.py:1950
+#: nova/compute/manager.py:1955
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:1956
+#: nova/compute/manager.py:1961
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1978
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2222
+#: nova/compute/manager.py:2227
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %(qr_error)s"
 msgstr ""
 
-#: nova/compute/manager.py:2277
+#: nova/compute/manager.py:2282
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2295
+#: nova/compute/manager.py:2300
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2333
+#: nova/compute/manager.py:2338
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2364
+#: nova/compute/manager.py:2369
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2384
+#: nova/compute/manager.py:2389
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2389
+#: nova/compute/manager.py:2394
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2392
+#: nova/compute/manager.py:2397
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2409
+#: nova/compute/manager.py:2414
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2434
+#: nova/compute/manager.py:2439
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2462
+#: nova/compute/manager.py:2467
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:2492
+#: nova/compute/manager.py:2497
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2543
+#: nova/compute/manager.py:2548
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2552
+#: nova/compute/manager.py:2557
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2567
+#: nova/compute/manager.py:2572
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:2597
+#: nova/compute/manager.py:2602
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2607
+#: nova/compute/manager.py:2612
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:2614
+#: nova/compute/manager.py:2619
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:2638
+#: nova/compute/manager.py:2643
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:2675
+#: nova/compute/manager.py:2680
 #, python-format
 msgid "Host %(host)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:2748
+#: nova/compute/manager.py:2753
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:2809
+#: nova/compute/manager.py:2814
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2837
+#: nova/compute/manager.py:2842
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2890
+#: nova/compute/manager.py:2895
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2892
+#: nova/compute/manager.py:2897
 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:2906
+#: nova/compute/manager.py:2911
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3044
+#: nova/compute/manager.py:3049
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3089
+#: nova/compute/manager.py:3094
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3095
+#: nova/compute/manager.py:3100
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3104
+#: nova/compute/manager.py:3109
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3111
+#: nova/compute/manager.py:3116
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3115
+#: nova/compute/manager.py:3120
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3122
+#: nova/compute/manager.py:3127
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3135
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3147
+#: nova/compute/manager.py:3152
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
 "%(end_time)s. %(number_instances)s instances."
 msgstr ""
 
-#: nova/compute/manager.py:3166
+#: nova/compute/manager.py:3171
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3195
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3308
+#: nova/compute/manager.py:3313
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3326
+#: nova/compute/manager.py:3331
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3355
+#: nova/compute/manager.py:3360
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3361 nova/compute/manager.py:3399
+#: nova/compute/manager.py:3366 nova/compute/manager.py:3404
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3386
+#: nova/compute/manager.py:3391
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:3422
+#: nova/compute/manager.py:3427
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3434 nova/compute/manager.py:3443
-#: nova/compute/manager.py:3467
+#: nova/compute/manager.py:3439 nova/compute/manager.py:3448
+#: nova/compute/manager.py:3478
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:3438
+#: nova/compute/manager.py:3443
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3454
+#: nova/compute/manager.py:3459
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3465
+msgid "Instance is unexpectedly not found. Ignore."
+msgstr ""
+
+#: nova/compute/manager.py:3471
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:3476
+#: nova/compute/manager.py:3487
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:3484
+#: nova/compute/manager.py:3495
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:3499
+#: nova/compute/manager.py:3510
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:3554
+#: nova/compute/manager.py:3565
 #, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:3561
+#: nova/compute/manager.py:3572
 #, 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:3568
+#: nova/compute/manager.py:3579
 #, python-format
 msgid "Unrecognized value '%(action)s' for CONF.running_deleted_instance_action"
 msgstr ""
@@ -4240,18 +4254,18 @@ msgstr ""
 msgid "Using %(prefix)s instead of %(req_prefix)s"
 msgstr ""
 
-#: nova/conductor/api.py:355
+#: nova/conductor/api.py:338
 msgid ""
 "Timed out waiting for nova-conductor. Is it running? Or did this service "
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:65
+#: nova/conductor/manager.py:67
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:225
+#: nova/conductor/manager.py:227
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
@@ -4329,71 +4343,53 @@ msgstr ""
 msgid "Failed to notify cells of instance destroy"
 msgstr ""
 
-#: nova/db/api.py:691 nova/db/api.py:712
+#: nova/db/api.py:680 nova/db/api.py:701
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:752
+#: nova/db/api.py:741
 msgid "Failed to notify cells of instance info cache update"
 msgstr ""
 
-#: nova/db/api.py:1463
+#: nova/db/api.py:1452
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
-#: nova/db/api.py:1617
+#: nova/db/api.py:1606
 msgid "Failed to notify cells of instance fault"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:191
+#: nova/db/sqlalchemy/api.py:194
 msgid "model or base_model parameter should be subclass of NovaBase"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:204 nova/virt/baremetal/db/sqlalchemy/api.py:60
+#: nova/db/sqlalchemy/api.py:207 nova/virt/baremetal/db/sqlalchemy/api.py:60
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:1386
+#: nova/db/sqlalchemy/api.py:1389
 #, python-format
 msgid ""
 "Unknown osapi_compute_unique_server_name_scope value: %s Flag must be "
 "empty, \"global\" or \"project\""
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:2753
+#: nova/db/sqlalchemy/api.py:2738
 #, python-format
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:71
+#: nova/db/sqlalchemy/migration.py:73
 #: nova/virt/baremetal/db/sqlalchemy/migration.py:69
 msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:98
+#: nova/db/sqlalchemy/migration.py:100
 #: nova/virt/baremetal/db/sqlalchemy/migration.py:97
 msgid "Upgrade DB using Essex release first."
 msgstr ""
 
-#: nova/db/sqlalchemy/session.py:386
-msgid "DB exception wrapped."
-msgstr ""
-
-#: nova/db/sqlalchemy/session.py:436
-#, python-format
-msgid "Got mysql server has gone away: %s"
-msgstr ""
-
-#: nova/db/sqlalchemy/session.py:477
-msgid "Using mysql/eventlet db_pool."
-msgstr ""
-
-#: nova/db/sqlalchemy/session.py:533
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
 #: nova/db/sqlalchemy/migrate_repo/versions/133_folsom.py:62
 msgid "Exception while seeding instance_types table"
 msgstr ""
@@ -4476,15 +4472,15 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/api.py:51 nova/network/api_deprecated.py:56
+#: nova/network/api.py:53 nova/network/api_deprecated.py:56
 msgid "instance is a required argument to use @refresh_cache"
 msgstr ""
 
-#: nova/network/api.py:76 nova/network/api_deprecated.py:79
+#: nova/network/api.py:78 nova/network/api_deprecated.py:79
 msgid "Failed storing info cache"
 msgstr ""
 
-#: nova/network/api.py:222 nova/network/api_deprecated.py:216
+#: nova/network/api.py:226 nova/network/api_deprecated.py:216
 #, python-format
 msgid "re-assign floating IP %(address)s from instance %(instance_id)s"
 msgstr ""
@@ -4498,69 +4494,69 @@ msgstr ""
 msgid "Loading network driver '%s'"
 msgstr ""
 
-#: nova/network/floating_ips.py:71
+#: nova/network/floating_ips.py:85
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/floating_ips.py:81 nova/network/floating_ips.py:354
+#: nova/network/floating_ips.py:95 nova/network/floating_ips.py:368
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/floating_ips.py:104
+#: nova/network/floating_ips.py:118
 #, python-format
 msgid "floating IP allocation for instance |%(floating_address)s|"
 msgstr ""
 
-#: nova/network/floating_ips.py:159
+#: nova/network/floating_ips.py:173
 msgid "Floating IP is not associated. Ignore."
 msgstr ""
 
-#: nova/network/floating_ips.py:177
+#: nova/network/floating_ips.py:191
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/floating_ips.py:181
+#: nova/network/floating_ips.py:195
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/floating_ips.py:201
+#: nova/network/floating_ips.py:215
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to allocate floating IP"
 msgstr ""
 
-#: nova/network/floating_ips.py:262
+#: nova/network/floating_ips.py:276
 msgid "Failed to update usages deallocating floating IP"
 msgstr ""
 
-#: nova/network/floating_ips.py:511
+#: nova/network/floating_ips.py:525
 #, python-format
 msgid "Starting migration network for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/network/floating_ips.py:518
+#: nova/network/floating_ips.py:532
 #, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notmigrate it "
 msgstr ""
 
-#: nova/network/floating_ips.py:549
+#: nova/network/floating_ips.py:563
 #, python-format
 msgid "Finishing migration network for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/network/floating_ips.py:557
+#: nova/network/floating_ips.py:571
 #, python-format
 msgid ""
 "Floating ip address |%(address)s| no longer belongs to instance "
 "%(instance_uuid)s. Will notsetup it."
 msgstr ""
 
-#: nova/network/floating_ips.py:605
+#: nova/network/floating_ips.py:619
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -4568,12 +4564,12 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/floating_ips.py:645
+#: nova/network/floating_ips.py:659
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/floating_ips.py:654
+#: nova/network/floating_ips.py:668
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
@@ -4714,29 +4710,29 @@ msgstr ""
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:364
+#: nova/network/manager.py:354
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:368
+#: nova/network/manager.py:358
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:493
+#: nova/network/manager.py:484
 msgid "network allocations"
 msgstr ""
 
-#: nova/network/manager.py:500
+#: nova/network/manager.py:491
 #, python-format
 msgid "networks retrieved for instance: |%(networks_list)s|"
 msgstr ""
 
-#: nova/network/manager.py:535
+#: nova/network/manager.py:536
 msgid "network deallocation for instance"
 msgstr ""
 
-#: nova/network/manager.py:763
+#: nova/network/manager.py:782
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
@@ -4744,89 +4740,89 @@ msgid ""
 "created."
 msgstr ""
 
-#: nova/network/manager.py:851
+#: nova/network/manager.py:870
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:870
+#: nova/network/manager.py:889
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:874
+#: nova/network/manager.py:893
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:882
+#: nova/network/manager.py:901
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:887
+#: nova/network/manager.py:906
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:891
+#: nova/network/manager.py:910
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:894
+#: nova/network/manager.py:913
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:913
+#: nova/network/manager.py:932
 #, python-format
 msgid "%s must be an integer"
 msgstr ""
 
-#: nova/network/manager.py:937
+#: nova/network/manager.py:956
 msgid "Maximum allowed length for 'label' is 255."
 msgstr ""
 
-#: nova/network/manager.py:957
+#: nova/network/manager.py:976
 #, python-format
 msgid ""
 "Subnet(s) too large, defaulting to /%s.  To override, specify "
 "network_size flag."
 msgstr ""
 
-#: nova/network/manager.py:1038
+#: nova/network/manager.py:1057
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1041
+#: nova/network/manager.py:1060
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1052
+#: nova/network/manager.py:1071
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1109
+#: nova/network/manager.py:1128
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1128
+#: nova/network/manager.py:1147
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1667
+#: nova/network/manager.py:1686
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1674
+#: nova/network/manager.py:1693
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s networks. "
@@ -4856,59 +4852,59 @@ msgstr ""
 msgid "Cannot delete domain |%s|"
 msgstr ""
 
-#: nova/network/model.py:354
+#: nova/network/model.py:375
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/network/quantumv2/__init__.py:41
+#: nova/network/quantumv2/__init__.py:42
 msgid "_get_auth_token() failed"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:131
+#: nova/network/quantumv2/api.py:134
 #, python-format
 msgid "allocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:134
+#: nova/network/quantumv2/api.py:137
 #, python-format
 msgid "empty project id for instance %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:195
+#: nova/network/quantumv2/api.py:198
 msgid "Port not found"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:203
+#: nova/network/quantumv2/api.py:206
 #, python-format
 msgid "Fail to delete port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:216
+#: nova/network/quantumv2/api.py:219
 #, python-format
 msgid "deallocate_for_instance() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:225
+#: nova/network/quantumv2/api.py:228
 #, python-format
 msgid "Failed to delete quantum port %(portid)s "
 msgstr ""
 
-#: nova/network/quantumv2/api.py:238
+#: nova/network/quantumv2/api.py:241
 #, python-format
 msgid "get_instance_nw_info() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:269 nova/network/quantumv2/api.py:296
+#: nova/network/quantumv2/api.py:272 nova/network/quantumv2/api.py:299
 #, python-format
 msgid "Unable to update port %(portid)s with failure: %(exception)s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:306
+#: nova/network/quantumv2/api.py:309
 #, python-format
 msgid "validate_networks() for %s"
 msgstr ""
 
-#: nova/network/quantumv2/api.py:560
+#: nova/network/quantumv2/api.py:561
 #, python-format
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
@@ -4923,17 +4919,17 @@ msgstr ""
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:188
+#: nova/openstack/common/lockutils.py:195
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:216
+#: nova/openstack/common/lockutils.py:223
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/openstack/common/lockutils.py:223
+#: nova/openstack/common/lockutils.py:231
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
@@ -4968,6 +4964,32 @@ msgstr ""
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
+#: nova/openstack/common/db/sqlalchemy/session.py:431
+msgid "DB exception wrapped."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:481
+#, python-format
+msgid "Got mysql server has gone away: %s"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:522
+msgid "Using mysql/eventlet db_pool."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/session.py:578
+#, python-format
+msgid "SQL connection failed. %s attempts left."
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:72
+msgid "Id not in sort_keys; is sort_keys unique?"
+msgstr ""
+
+#: nova/openstack/common/db/sqlalchemy/utils.py:120
+msgid "Unknown sort direction, must be 'desc' or 'asc'"
+msgstr ""
+
 #: nova/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
@@ -5000,6 +5022,14 @@ msgstr ""
 msgid "Failed to load plugin %(plug)s: %(exc)s"
 msgstr ""
 
+#: nova/openstack/common/rpc/__init__.py:105
+#, python-format
+msgid ""
+"A RPC is being made while holding a lock. The locks currently held are "
+"%(locks)s. This is probably a bug. Please report it. Include the "
+"following: [%(stack)s]."
+msgstr ""
+
 #: nova/openstack/common/rpc/amqp.py:57
 msgid "Pool creating new connection"
 msgstr ""
@@ -5025,13 +5055,13 @@ msgid "No method for message: %s"
 msgstr ""
 
 #: nova/openstack/common/rpc/amqp.py:286
-#: nova/openstack/common/rpc/impl_zmq.py:265
+#: nova/openstack/common/rpc/impl_zmq.py:277
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
 #: nova/openstack/common/rpc/amqp.py:292
-#: nova/openstack/common/rpc/impl_zmq.py:271
+#: nova/openstack/common/rpc/impl_zmq.py:283
 msgid "Exception during message handling"
 msgstr ""
 
@@ -5100,237 +5130,248 @@ msgstr ""
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:169
-#: nova/openstack/common/rpc/impl_qpid.py:130
+#: nova/openstack/common/rpc/impl_kombu.py:170
+#: nova/openstack/common/rpc/impl_qpid.py:133
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:471
+#: nova/openstack/common/rpc/impl_kombu.py:478
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:493
+#: nova/openstack/common/rpc/impl_kombu.py:500
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:530
+#: nova/openstack/common/rpc/impl_kombu.py:537
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:546
+#: nova/openstack/common/rpc/impl_kombu.py:553
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:600
-#: nova/openstack/common/rpc/impl_qpid.py:397
+#: nova/openstack/common/rpc/impl_kombu.py:607
+#: nova/openstack/common/rpc/impl_qpid.py:403
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:618
-#: nova/openstack/common/rpc/impl_qpid.py:412
+#: nova/openstack/common/rpc/impl_kombu.py:625
+#: nova/openstack/common/rpc/impl_qpid.py:418
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:622
-#: nova/openstack/common/rpc/impl_qpid.py:416
+#: nova/openstack/common/rpc/impl_kombu.py:629
+#: nova/openstack/common/rpc/impl_qpid.py:422
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_kombu.py:661
-#: nova/openstack/common/rpc/impl_qpid.py:451
+#: nova/openstack/common/rpc/impl_kombu.py:668
+#: nova/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_qpid.py:345
+#: nova/openstack/common/rpc/impl_qpid.py:351
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_qpid.py:351
+#: nova/openstack/common/rpc/impl_qpid.py:357
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_qpid.py:364
+#: nova/openstack/common/rpc/impl_qpid.py:370
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_qpid.py:424
+#: nova/openstack/common/rpc/impl_qpid.py:430
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:89
+#: nova/openstack/common/rpc/impl_zmq.py:94
 msgid "JSON serialization failed."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:97
+#: nova/openstack/common/rpc/impl_zmq.py:102
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:133
+#: nova/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:134
+#: nova/openstack/common/rpc/impl_zmq.py:139
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:135
+#: nova/openstack/common/rpc/impl_zmq.py:140
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:143
+#: nova/openstack/common/rpc/impl_zmq.py:148
 msgid "Could not open socket."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:155
+#: nova/openstack/common/rpc/impl_zmq.py:160
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:193
+#: nova/openstack/common/rpc/impl_zmq.py:202
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:198
+#: nova/openstack/common/rpc/impl_zmq.py:207
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:253
+#: nova/openstack/common/rpc/impl_zmq.py:265
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:285
+#: nova/openstack/common/rpc/impl_zmq.py:297
 msgid "Sending reply"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:353
+#: nova/openstack/common/rpc/impl_zmq.py:331
+msgid "RPC message did not include method."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:366
 msgid "Registering reactor"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:365
+#: nova/openstack/common/rpc/impl_zmq.py:378
 msgid "In reactor registered"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:380
+#: nova/openstack/common/rpc/impl_zmq.py:393
 msgid "Out reactor registered"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:384
+#: nova/openstack/common/rpc/impl_zmq.py:397
 msgid "Consuming socket"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:431
+#: nova/openstack/common/rpc/impl_zmq.py:438
 #, python-format
 msgid "CONSUMER GOT %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:441
+#: nova/openstack/common/rpc/impl_zmq.py:447
 #, python-format
-msgid "->response->%s"
+msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:451
+#: nova/openstack/common/rpc/impl_zmq.py:471
 #, python-format
-msgid "Created topic proxy: %s"
+msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:480
+msgid "Topic socket file creation failed."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:458
+#: nova/openstack/common/rpc/impl_zmq.py:485
 #, python-format
-msgid "ROUTER RELAY-OUT START %(data)s"
+msgid "ROUTER RELAY-OUT QUEUED %(data)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:460
+#: nova/openstack/common/rpc/impl_zmq.py:488
 #, python-format
-msgid "ROUTER RELAY-OUT SUCCEEDED %(data)s"
+msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:476
+#: nova/openstack/common/rpc/impl_zmq.py:506
+#, python-format
+msgid "Could not create IPC directory %s"
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:516
+msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:536
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:478
+#: nova/openstack/common/rpc/impl_zmq.py:538
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:504
+#: nova/openstack/common/rpc/impl_zmq.py:564
 #, python-format
 msgid "Create Consumer for topic (%(topic)s)"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:520
+#: nova/openstack/common/rpc/impl_zmq.py:580
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:564
+#: nova/openstack/common/rpc/impl_zmq.py:625
 msgid "Creating payload"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:577
+#: nova/openstack/common/rpc/impl_zmq.py:638
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:588
+#: nova/openstack/common/rpc/impl_zmq.py:649
 msgid "Sending cast"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:591
+#: nova/openstack/common/rpc/impl_zmq.py:653
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:594
+#: nova/openstack/common/rpc/impl_zmq.py:656
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:595
+#: nova/openstack/common/rpc/impl_zmq.py:657
 msgid "Unpacking response"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:623
+#: nova/openstack/common/rpc/impl_zmq.py:663
+msgid "RPC Message Invalid."
+msgstr ""
+
+#: nova/openstack/common/rpc/impl_zmq.py:687
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:626
+#: nova/openstack/common/rpc/impl_zmq.py:690
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:630
+#: nova/openstack/common/rpc/impl_zmq.py:694
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: nova/openstack/common/rpc/impl_zmq.py:723
-msgid ""
-"Matchmaker could not be loaded.\n"
-"rpc_zmq_matchmaker is not a class."
-msgstr ""
-
-#: nova/openstack/common/rpc/impl_zmq.py:725
-msgid "Error loading Matchmaker."
-msgstr ""
-
 #: nova/openstack/common/rpc/matchmaker.py:45
 msgid "Match not found by MatchMaker."
 msgstr ""
@@ -5366,7 +5407,7 @@ msgstr ""
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:278
+#: nova/scheduler/driver.py:271
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -5404,6 +5445,11 @@ msgstr ""
 msgid "Choosing host %(best_host)s"
 msgstr ""
 
+#: nova/scheduler/filter_scheduler.py:327
+#, python-format
+msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
+msgstr ""
+
 #: nova/scheduler/host_manager.py:306
 #, python-format
 msgid "Host filter ignoring hosts: %(ignored_hosts_str)s"
@@ -5421,17 +5467,17 @@ msgstr ""
 msgid "Host filter forcing available hosts to %(forced_hosts_str)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:349
+#: nova/scheduler/host_manager.py:352
 #, python-format
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:354
+#: nova/scheduler/host_manager.py:357
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:372
+#: nova/scheduler/host_manager.py:375
 #: nova/scheduler/filters/trusted_filter.py:220
 #, python-format
 msgid "No service for compute ID %s"
@@ -5641,19 +5687,19 @@ msgstr ""
 msgid "already detached"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:859
+#: nova/tests/fakelibvirt.py:861
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:863
+#: nova/tests/fakelibvirt.py:865
 msgid "Expected a list for 'auth' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:867
+#: nova/tests/fakelibvirt.py:869
 msgid "Expected a function in 'auth[0]' parameter"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:871
+#: nova/tests/fakelibvirt.py:873
 msgid "Expected a function in 'auth[1]' parameter"
 msgstr ""
 
@@ -5795,7 +5841,7 @@ msgstr ""
 #: nova/tests/compute/test_compute.py:734
 #: nova/tests/compute/test_compute.py:785
 #: nova/tests/compute/test_compute.py:812
-#: nova/tests/compute/test_compute.py:2765
+#: nova/tests/compute/test_compute.py:2766
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
@@ -5808,25 +5854,25 @@ msgstr ""
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1262
+#: nova/tests/compute/test_compute.py:1263
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:2776
+#: nova/tests/compute/test_compute.py:2777
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:3274
+#: nova/tests/compute/test_compute.py:3275
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:165
+#: nova/tests/integrated/test_api_samples.py:166
 #, python-format
 msgid "Result: %(result)s is not a dict."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:169
+#: nova/tests/integrated/test_api_samples.py:170
 #, python-format
 msgid ""
 "Key mismatch:\n"
@@ -5834,21 +5880,21 @@ msgid ""
 "%(res_keys)s"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:177
+#: nova/tests/integrated/test_api_samples.py:178
 #, python-format
 msgid "Result: %(result)s is not a list."
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:195
+#: nova/tests/integrated/test_api_samples.py:196
 msgid "Extra items in expected:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:199
+#: nova/tests/integrated/test_api_samples.py:200
 msgid "Extra items in result:"
 msgstr ""
 
-#: nova/tests/integrated/test_api_samples.py:218
-#: nova/tests/integrated/test_api_samples.py:231
+#: nova/tests/integrated/test_api_samples.py:219
+#: nova/tests/integrated/test_api_samples.py:232
 #, python-format
 msgid ""
 "Values do not match:\n"
@@ -5915,16 +5961,16 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:873
+#: nova/virt/driver.py:872
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:876
+#: nova/virt/driver.py:875
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:883
+#: nova/virt/driver.py:882
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
@@ -5934,7 +5980,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:179 nova/virt/libvirt/firewall.py:254
+#: nova/virt/firewall.py:179 nova/virt/libvirt/firewall.py:267
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -5974,31 +6020,31 @@ msgstr ""
 msgid "Converted to raw, but format is now %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:93
+#: nova/virt/baremetal/driver.py:94
 #, python-format
 msgid "Request for baremetal node %s sent to wrong service host"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:145
+#: nova/virt/baremetal/driver.py:146
 msgid "cpu_arch is not found in instance_type_extra_specs"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:184
+#: nova/virt/baremetal/driver.py:185
 #, python-format
 msgid "Node %(id)r assigned to instance %(uuid)r which cannot be found."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:199
+#: nova/virt/baremetal/driver.py:200
 #, python-format
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:270
+#: nova/virt/baremetal/driver.py:271
 #, python-format
 msgid "Failed to update state record for baremetal node %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:289
+#: nova/virt/baremetal/driver.py:290
 #, python-format
 msgid "Delete called on non-existing instance %s"
 msgstr ""
@@ -6046,29 +6092,29 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:84
+#: nova/virt/baremetal/pxe.py:85
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:225
+#: nova/virt/baremetal/pxe.py:224
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:250
+#: nova/virt/baremetal/pxe.py:249
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:282
+#: nova/virt/baremetal/pxe.py:281
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:319
+#: nova/virt/baremetal/pxe.py:318
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
@@ -6125,6 +6171,18 @@ msgstr ""
 msgid "no pif for vif_uuid=%s"
 msgstr ""
 
+#: nova/virt/baremetal/virtual_power_driver.py:97
+msgid "virtual_power_ssh_host not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:101
+msgid "virtual_power_host_user not defined. Can not Start"
+msgstr ""
+
+#: nova/virt/baremetal/virtual_power_driver.py:105
+msgid "virtual_power_host_pass not defined. Can not Start"
+msgstr ""
+
 #: nova/virt/baremetal/volume_driver.py:120
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
@@ -6200,7 +6258,7 @@ msgstr ""
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:288
+#: nova/virt/disk/api.py:294
 #, python-format
 msgid ""
 "Inject data image=%(image)s key=%(key)s net=%(net)s metadata=%(metadata)s"
@@ -6208,63 +6266,68 @@ msgid ""
 "partition=%(partition)s use_cow=%(use_cow)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:305
+#: nova/virt/disk/api.py:311
 #, python-format
 msgid "Ignoring error injecting data into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:324
+#: nova/virt/disk/api.py:330
 #, python-format
 msgid ""
 "Failed to mount container filesystem '%(image)s' on '%(target)s': "
 "%(errors)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:341
+#: nova/virt/disk/api.py:347
+#, python-format
+msgid "Failed to teardown ntainer filesystem: %s"
+msgstr ""
+
+#: nova/virt/disk/api.py:360
 #, python-format
-msgid "Failed to unmount container filesystem: %s"
+msgid "Failed to umount container filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:366
+#: nova/virt/disk/api.py:385
 #, python-format
 msgid "Ignoring error injecting %(inject)s into image (%(e)s)"
 msgstr ""
 
-#: nova/virt/disk/api.py:378
+#: nova/virt/disk/api.py:397
 #, python-format
 msgid "Inject file fs=%(fs)s path=%(path)s append=%(append)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:387
+#: nova/virt/disk/api.py:406
 #, python-format
 msgid "Inject metadata fs=%(fs)s metadata=%(metadata)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:428
+#: nova/virt/disk/api.py:447
 #, python-format
 msgid "Inject key fs=%(fs)s key=%(key)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:476
 #, python-format
 msgid "Inject key fs=%(fs)s net=%(net)s"
 msgstr ""
 
-#: nova/virt/disk/api.py:483
+#: nova/virt/disk/api.py:502
 #, python-format
 msgid "Inject admin password fs=%(fs)s admin_passwd=ha-ha-not-telling-you"
 msgstr ""
 
-#: nova/virt/disk/api.py:528
+#: nova/virt/disk/api.py:547
 msgid "Not implemented on Windows"
 msgstr ""
 
-#: nova/virt/disk/api.py:557
+#: nova/virt/disk/api.py:576
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:573
+#: nova/virt/disk/api.py:592
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -6606,7 +6669,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:131 nova/virt/libvirt/driver.py:3302
+#: nova/virt/hyperv/hostops.py:131 nova/virt/libvirt/driver.py:3327
 #: nova/virt/xenapi/host.py:149
 msgid "Updating host stats"
 msgstr ""
@@ -6802,12 +6865,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:192 nova/virt/libvirt/driver.py:1537
+#: nova/virt/hyperv/vmops.py:192 nova/virt/libvirt/driver.py:1529
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:199 nova/virt/libvirt/driver.py:1543
+#: nova/virt/hyperv/vmops.py:199 nova/virt/libvirt/driver.py:1535
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -6981,7 +7044,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:159 nova/virt/libvirt/driver.py:642
+#: nova/virt/hyperv/volumeops.py:159 nova/virt/libvirt/driver.py:644
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -7025,189 +7088,189 @@ msgstr ""
 msgid "Unable to determine disk bus for '%s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:349
+#: nova/virt/libvirt/driver.py:351
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:355
+#: nova/virt/libvirt/driver.py:357
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:376
+#: nova/virt/libvirt/driver.py:378
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:398 nova/virt/libvirt/driver.py:401
+#: nova/virt/libvirt/driver.py:400 nova/virt/libvirt/driver.py:403
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:419
+#: nova/virt/libvirt/driver.py:421
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:507
+#: nova/virt/libvirt/driver.py:509
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:521
+#: nova/virt/libvirt/driver.py:523
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:526
+#: nova/virt/libvirt/driver.py:528
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:549
+#: nova/virt/libvirt/driver.py:551
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:566
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:580
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:598
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:605
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:757
+#: nova/virt/libvirt/driver.py:759
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:845
+#: nova/virt/libvirt/driver.py:852
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:848
+#: nova/virt/libvirt/driver.py:855
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:879
+#: nova/virt/libvirt/driver.py:884
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:891
+#: nova/virt/libvirt/driver.py:896
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:964
+#: nova/virt/libvirt/driver.py:969
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:968
+#: nova/virt/libvirt/driver.py:973
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1002
+#: nova/virt/libvirt/driver.py:1008
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1010
+#: nova/virt/libvirt/driver.py:1016
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1044
+#: nova/virt/libvirt/driver.py:1058
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1187
+#: nova/virt/libvirt/driver.py:1201
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1194 nova/virt/powervm/operator.py:255
+#: nova/virt/libvirt/driver.py:1208 nova/virt/powervm/operator.py:272
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1210
+#: nova/virt/libvirt/driver.py:1224
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1247 nova/virt/libvirt/driver.py:1273
+#: nova/virt/libvirt/driver.py:1261 nova/virt/libvirt/driver.py:1287
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1262
+#: nova/virt/libvirt/driver.py:1276
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1331
+#: nova/virt/libvirt/driver.py:1345
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1335
+#: nova/virt/libvirt/driver.py:1349
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1339 nova/virt/libvirt/driver.py:1343
+#: nova/virt/libvirt/driver.py:1353 nova/virt/libvirt/driver.py:1357
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1409
+#: nova/virt/libvirt/driver.py:1423
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1528
+#: nova/virt/libvirt/driver.py:1520
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1554
+#: nova/virt/libvirt/driver.py:1568
 #, python-format
-msgid "Injecting %(inject)s into image %(img_id)s"
+msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1563
+#: nova/virt/libvirt/driver.py:1577
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1621
+#: nova/virt/libvirt/driver.py:1635
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1627
+#: nova/virt/libvirt/driver.py:1641
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1631
+#: nova/virt/libvirt/driver.py:1645
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1635
+#: nova/virt/libvirt/driver.py:1649
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1651
+#: nova/virt/libvirt/driver.py:1665
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1952
+#: nova/virt/libvirt/driver.py:1966
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -7215,80 +7278,80 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1968
+#: nova/virt/libvirt/driver.py:1982
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1985
+#: nova/virt/libvirt/driver.py:1999
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2148
+#: nova/virt/libvirt/driver.py:2166
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2202
+#: nova/virt/libvirt/driver.py:2220
 #, python-format
 msgid "List of domains returned by libVirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2204
+#: nova/virt/libvirt/driver.py:2222
 #, python-format
 msgid "libVirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2286
+#: nova/virt/libvirt/driver.py:2304
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2369
+#: nova/virt/libvirt/driver.py:2387
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2393
+#: nova/virt/libvirt/driver.py:2411
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2397
+#: nova/virt/libvirt/driver.py:2415
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2513
+#: nova/virt/libvirt/driver.py:2531
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2521
+#: nova/virt/libvirt/driver.py:2539
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2558
+#: nova/virt/libvirt/driver.py:2576
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2583
+#: nova/virt/libvirt/driver.py:2601
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2595
+#: nova/virt/libvirt/driver.py:2613
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -7298,62 +7361,62 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2612
+#: nova/virt/libvirt/driver.py:2630
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2660
+#: nova/virt/libvirt/driver.py:2678
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2732
+#: nova/virt/libvirt/driver.py:2750
 #, python-format
 msgid "Live Migration failure: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2825
+#: nova/virt/libvirt/driver.py:2843
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2930
+#: nova/virt/libvirt/driver.py:2953
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2945
+#: nova/virt/libvirt/driver.py:2970
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2994
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3042
+#: nova/virt/libvirt/driver.py:3067
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3101
+#: nova/virt/libvirt/driver.py:3126
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3107
+#: nova/virt/libvirt/driver.py:3132
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3163
+#: nova/virt/libvirt/driver.py:3188
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3276
+#: nova/virt/libvirt/driver.py:3301
 #, python-format
 msgid "Checking instance files accessability%(instance_path)s"
 msgstr ""
@@ -7372,25 +7435,25 @@ msgstr ""
 msgid "Ensuring static filters"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:196
+#: nova/virt/libvirt/firewall.py:209
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:219
+#: nova/virt/libvirt/firewall.py:232
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:235
+#: nova/virt/libvirt/firewall.py:248
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:209
+#: nova/virt/libvirt/imagebackend.py:232
 msgid "You should specify libvirt_images_volume_group flag to use LVM images."
 msgstr ""
 
-#: nova/virt/libvirt/imagebackend.py:272
+#: nova/virt/libvirt/imagebackend.py:292
 #, python-format
 msgid "Unknown image_type=%s"
 msgstr ""
@@ -7536,11 +7599,6 @@ msgstr ""
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/snapshots.py:83 nova/virt/libvirt/snapshots.py:86
-#: nova/virt/libvirt/snapshots.py:89
-msgid "LVM snapshots not implemented"
-msgstr ""
-
 #: nova/virt/libvirt/utils.py:124
 #, python-format
 msgid ""
@@ -7566,40 +7624,40 @@ msgstr ""
 msgid "Path %s must be LVM logical volume"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:479
+#: nova/virt/libvirt/utils.py:483
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:140 nova/virt/libvirt/vif.py:202
-#: nova/virt/libvirt/vif.py:243
+#: nova/virt/libvirt/vif.py:231 nova/virt/libvirt/vif.py:342
+#: nova/virt/libvirt/vif.py:429
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:146 nova/virt/libvirt/vif.py:208
-#: nova/virt/libvirt/vif.py:249
+#: nova/virt/libvirt/vif.py:237 nova/virt/libvirt/vif.py:348
+#: nova/virt/libvirt/vif.py:435
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:155 nova/virt/libvirt/vif.py:217
-#: nova/virt/libvirt/vif.py:258
+#: nova/virt/libvirt/vif.py:250 nova/virt/libvirt/vif.py:361
+#: nova/virt/libvirt/vif.py:448
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:167
+#: nova/virt/libvirt/vif.py:262
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:177
+#: nova/virt/libvirt/vif.py:272
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:234 nova/virt/libvirt/vif.py:371
+#: nova/virt/libvirt/vif.py:378 nova/virt/libvirt/vif.py:407
 msgid "Failed while unplugging vif"
 msgstr ""
 
@@ -7723,7 +7781,7 @@ msgstr ""
 msgid "File transfer from PowerVM manager failed"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:157
+#: nova/virt/powervm/driver.py:160
 #, python-format
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
@@ -7784,74 +7842,74 @@ msgstr ""
 msgid "PowerVM LPAR instance '%(instance_name)s' cleanup failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:100
+#: nova/virt/powervm/operator.py:101
 #, python-format
 msgid "LPAR instance '%s' not found"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:184
+#: nova/virt/powervm/operator.py:185
 msgid "Not enough free memory in the host"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:194
+#: nova/virt/powervm/operator.py:195
 msgid "Insufficient available CPU on PowerVM"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:218
+#: nova/virt/powervm/operator.py:233
 #, python-format
 msgid "Creating LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:221
+#: nova/virt/powervm/operator.py:238
 #, python-format
 msgid "LPAR instance '%s' creation failed"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:238
+#: nova/virt/powervm/operator.py:255
 #, python-format
 msgid "PowerVM image creation failed: %s"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:246
+#: nova/virt/powervm/operator.py:263
 #, python-format
 msgid "Activating the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:260
+#: nova/virt/powervm/operator.py:277
 #, python-format
 msgid "Instance '%s' failed to boot"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:272
+#: nova/virt/powervm/operator.py:289
 msgid "Error while attempting to clean up failed instance launch."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:276
+#: nova/virt/powervm/operator.py:293
 #, python-format
 msgid "Instance spawned in %s seconds"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:287
+#: nova/virt/powervm/operator.py:304
 #, python-format
 msgid "During destroy, LPAR instance '%s' was not found on PowerVM system."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:303
+#: nova/virt/powervm/operator.py:320
 #, python-format
 msgid "Stopping instance %s for snapshot."
 msgstr ""
 
-#: nova/virt/powervm/operator.py:326
+#: nova/virt/powervm/operator.py:343
 #, python-format
 msgid "Shutting down the instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:335
+#: nova/virt/powervm/operator.py:352
 #, python-format
 msgid "Deleting the LPAR instance '%s'"
 msgstr ""
 
-#: nova/virt/powervm/operator.py:338
+#: nova/virt/powervm/operator.py:355
 msgid "PowerVM instance cleanup failed"
 msgstr ""
 
@@ -8311,7 +8369,7 @@ msgstr ""
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1285
+#: nova/virt/vmwareapi/vmops.py:1047 nova/virt/xenapi/vmops.py:1263
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
@@ -8457,7 +8515,7 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:169 nova/virt/xenapi/volumeops.py:122
+#: nova/virt/vmwareapi/volumeops.py:169 nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
@@ -8466,24 +8524,24 @@ msgstr ""
 msgid "Unable to find volume"
 msgstr ""
 
-#: nova/virt/vmwareapi/volumeops.py:190 nova/virt/xenapi/volumeops.py:152
+#: nova/virt/vmwareapi/volumeops.py:190 nova/virt/xenapi/volumeops.py:131
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:87 nova/virt/xenapi/vmops.py:1528
+#: nova/virt/xenapi/agent.py:87 nova/virt/xenapi/vmops.py:1506
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:91 nova/virt/xenapi/vmops.py:1532
+#: nova/virt/xenapi/agent.py:91 nova/virt/xenapi/vmops.py:1510
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:96 nova/virt/xenapi/vmops.py:1537
+#: nova/virt/xenapi/agent.py:96 nova/virt/xenapi/vmops.py:1515
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
@@ -9276,85 +9334,85 @@ msgstr ""
 msgid "Unable to find root VBD/VDI for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1054
+#: nova/virt/xenapi/vmops.py:1032
 msgid "Destroying VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1081
+#: nova/virt/xenapi/vmops.py:1059
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1088
+#: nova/virt/xenapi/vmops.py:1066
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1095
+#: nova/virt/xenapi/vmops.py:1073
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1122
+#: nova/virt/xenapi/vmops.py:1100
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1151
+#: nova/virt/xenapi/vmops.py:1129
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1202
+#: nova/virt/xenapi/vmops.py:1180
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1236
+#: nova/virt/xenapi/vmops.py:1214
 msgid "VM is not present, skipping soft delete..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1289
+#: nova/virt/xenapi/vmops.py:1267
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1327
 msgid "Fetching VM ref while BUILDING failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1432
+#: nova/virt/xenapi/vmops.py:1410
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1451
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1460
+#: nova/virt/xenapi/vmops.py:1438
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1463
+#: nova/virt/xenapi/vmops.py:1441
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1491
+#: nova/virt/xenapi/vmops.py:1469
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1587
+#: nova/virt/xenapi/vmops.py:1565
 #, python-format
 msgid ""
 "Destination host:%(hostname)s must be in the same aggregate as the source"
 " server"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1619
+#: nova/virt/xenapi/vmops.py:1597
 msgid "Migrate Receive failed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1667
+#: nova/virt/xenapi/vmops.py:1645
 msgid "VM.assert_can_migratefailed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1703
+#: nova/virt/xenapi/vmops.py:1681
 msgid "Migrate Send failed"
 msgstr ""
 
@@ -9503,26 +9561,6 @@ msgstr ""
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:131
-#, python-format
-msgid "Unable to locate volume %s"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:138
-#, python-format
-msgid "Unable to detach volume %s"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:143
-#, python-format
-msgid "Unable to destroy vbd %s"
-msgstr ""
-
-#: nova/virt/xenapi/volumeops.py:150
-#, python-format
-msgid "Error purging SR %s"
-msgstr ""
-
 #: nova/virt/xenapi/imageupload/glance.py:34
 #, python-format
 msgid "Asking xapi to upload to glance %(vdi_uuids)s as ID %(image_id)s"
-- 
cgit