Imported Translations from Launchpad

Change-Id: Ie1c613e5690d3c2956f5d10f55985d9b4f3a86cc

19 files changed, 32077 insertions, 27600 deletions

diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index 6fa462c37..24cdb7b81 100644
--- a/nova/locale/bs/LC_MESSAGES/nova.po
+++ b/nova/locale/bs/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2012-01-19 20:22+0000\n"
 "Last-Translator: yazar  <zrncescientiae@gmail.com>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Neočekivana greška prilikom pokretanja komande."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -80,257 +80,262 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -338,745 +343,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1100,364 +1142,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr ""
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1466,240 +1509,245 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1740,39 +1788,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1803,31 +1818,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1836,57 +1863,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1981,31 +2008,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2030,216 +2069,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2315,7 +2341,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2408,32 +2433,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2462,23 +2488,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2530,114 +2556,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2649,261 +2682,272 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2922,493 +2966,467 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1764
 #, python-format
-msgid "Attach failed %(mountpoint)s, removing"
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3453,17 +3471,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3472,37 +3490,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3510,104 +3528,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3666,117 +3643,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3784,115 +3766,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3932,54 +3914,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4031,89 +4013,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4141,41 +4123,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4188,59 +4170,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4305,21 +4287,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4364,29 +4346,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4434,12 +4416,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4454,19 +4436,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4489,32 +4470,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4573,21 +4554,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4596,26 +4577,24 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4627,7 +4606,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4652,27 +4631,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4800,99 +4779,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4944,32 +4923,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4988,11 +4967,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5015,182 +5000,182 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5200,42 +5185,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5266,151 +5248,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, python-format
+msgid "Read: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "Writing image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5442,32 +5444,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5549,23 +5551,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5579,225 +5579,199 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5807,76 +5781,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5966,512 +5954,512 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6515,39 +6503,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6565,88 +6553,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6679,7 +6667,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6692,11 +6680,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6764,101 +6752,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -6995,117 +6983,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7133,144 +7121,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, python-format
 msgid "No LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, python-format
 msgid "Deleting volumeID: %s"
 msgstr ""
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7324,36 +7312,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7434,6 +7422,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7455,6 +7446,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7471,6 +7465,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7483,12 +7480,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7537,6 +7561,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7630,6 +7657,73 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: retrieving diagnostics"
+#~ msgstr ""
+
+#~ msgid "instance %s: suspending"
+#~ msgstr ""
+
+#~ msgid "instance %s: resuming"
+#~ msgstr ""
+
+#~ msgid "instance %s: locking"
+#~ msgstr ""
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting locked state"
+#~ msgstr ""
+
+#~ msgid "instance %s: reset network"
+#~ msgstr ""
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid "Detaching volume from unknown instance %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7647,15 +7741,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7849,6 +7990,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7863,6 +8010,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7877,12 +8027,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7921,6 +8080,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr ""
 
@@ -7959,6 +8217,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8159,6 +8423,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index 932c13e38..afc005282 100644
--- a/nova/locale/cs/LC_MESSAGES/nova.po
+++ b/nova/locale/cs/LC_MESSAGES/nova.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
-"PO-Revision-Date: 2012-04-18 20:50+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
+"PO-Revision-Date: 2012-05-12 21:13+0000\n"
 "Last-Translator: Zbyněk Schwarz <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
@@ -69,11 +69,11 @@ msgstr "Předmět certifikátu pro projekty, %s pro projekt, časové razítko"
 msgid "Flags path: %s"
 msgstr "Cesta příznaků: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Při spuštění příkazu došlo k nečekané chybě."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -88,141 +88,150 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr "Vyjímka DB zabalena."
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr "Vyskytla se neočekávaná výjimka."
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr "Nelze dešifrovat text"
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr "Nelze stránkovat skrze obrázky ze služby obrázků"
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr "Vytvoření virtuálního rozhraní selhalo"
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "Selhalo 5 pokusů o vytvoření virtuálního rozhraní s jedinečnou mac adresou"
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr "Připojení k glance selhalo"
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr "Připojení k melange selhalo"
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr "Neschváleno."
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Pravidla nedovolují, aby bylo %(action)s provedeno."
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Kernel nenalezen v obrazu %(image_id)s."
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr "Nepřijatelné parametry."
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr "Neplatný snímek"
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Svazek %(volume_id)s není k ničemu připojen"
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr "Data páru klíčů jsou neplatná"
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr "Nelze načíst data do formátu json"
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr "Požadavek je neplatný."
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr "Neplatný podpis %(signature)s pro uživatele %(user)s."
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr "Obdržen neplatný vstup"
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr "Neplatná instance typu %(instance_type)s."
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr "Neplatný typ svazku"
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr "Neplatný svazek"
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr "Neplatná metadata"
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Neplatný rozsah portů %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Neplatný protokol IP %(protocol)s."
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Neplatný typ obsahu %(content_type)s."
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Neplatný cidr %(cidr)s."
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr "Neplatné znovu použití připojení RPC."
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -231,12 +240,12 @@ msgstr ""
 "Nelze provést činnost '%(action)s' na agregátu %(aggregate_id)s. Důvod: "
 "%(reason)s."
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -245,100 +254,96 @@ msgstr ""
 "Instance %(instance_uuid)s v %(attr)s %(state)s.  Nelze %(method)s "
 "zatímco je instance v tomto stavu."
 
-#: nova/exception.py:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s není spuštěna."
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "Instance %(instance_id)s není pozastavena."
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr "Server nemůže pokračovat"
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr "Služba je v tuto chvíli nedostupná."
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr "Služba svazku je v tuto chvíli nedostupná."
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr "Služba výpočtu je v tuto chvíli nedostupná."
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 "Nelze přesunout instanci (%(instance_id)s) na současného hostitele "
 "(%(host)s)."
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr "Cílový výpočetní hostitel je v současnosti nedostupný."
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr "Původní výpočetní hostitel je v současnosti nedostupný."
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Zadaný typ hypervizoru je neplatný."
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Instance vyžaduje novější verzi hypervizoru, než byla poskytnuta."
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "Zadaná cesta disku (%(path)s) již existuje, očekává se, že nebude."
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr "Nepřijatelné informace o procesoru"
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s není platná IP adresa v4/6."
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -347,7 +352,7 @@ msgstr ""
 "Značka VLAN není vhodná pro skupinu portů %(bridge)s. Očekávaná značka "
 "VLAN je %(tag)s, ale značka připojená ke skupině portů je %(pgroup)s."
 
-#: nova/exception.py:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -358,70 +363,74 @@ msgstr ""
 " fyzickým adaptérem. Očekávaný vSwitch je %(expected)s, ale spojený je "
 "%(actual)s."
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formát disku %(disk_format)s není přijatelný"
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Obraz %(image_id)s je nepřijatelný: %(reason)s"
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Instance %(instance_id)s je nepřijatelná: %(reason)s"
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Id Ec2 %(ec2_id)s je nepřijatelné."
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr "Zdroj nemohl být nalezen."
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr "Požadovaný příznak %(flag)s není nastaven."
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, fuzzy, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "Nelze nalézt účet %(account_name) on zařízení Solidfire"
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "Svazek %(volume_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr "Nalezeno nula typů svazku."
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Typ svazku %(volume_type_id)s nemohl být nalezen."
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Typ svazku s názvem %(volume_type_name)s nemohl být nalezen."
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -430,42 +439,42 @@ msgstr ""
 "Typ svazku %(volume_type_id)s nemá žádné dodatečné parametry s klíčem "
 "%(extra_specs_key)s."
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "mazání svazku %(volume_name)s který má snímek"
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "Nenalezeno žádné cílové id ve svazku %(volume_id)s."
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Źádný disk ve %(location)s"
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Nelze najít obslužnou rutinu pro svazek %(driver_type)s."
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Neplatný href %(image_href)s obrazu."
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
@@ -473,80 +482,80 @@ msgstr ""
 "Některé obrazy byly uloženy pomocí href. Tato verze api nepodporuje "
 "zobrazování href obrazů."
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "Kernel nenalezen v obrazu %(image_id)s."
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr "Uživatel %(user_id)s nemohl být nalezen."
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Projekt %(project_id)s nemohl být nalezen."
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr "Uživatel %(user_id)s není členem projektu %(project_id)s."
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr "Role %(role_id)s nemohla být nalezena."
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr "Nelze najít SR pro čtení/zápis VDI."
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s je vyžadováno pro vytvoření sítě."
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Síť nemohla být pro most %(bridge)s nalezena."
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Síť nemohla být pro uuid %(uuid)s nalezena."
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Síť nemohla být pro cidr %(cidr)s nalezena."
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Síť nemohla být pro instance %(instance_id)s nalezena."
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr "Źádné sítě nejsou určeny."
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -555,190 +564,190 @@ msgstr ""
 "Buď síť uuid %(network_uuid)s není přítomna nebo je přidělena projektu "
 "%(project_id)s."
 
-#: nova/exception.py:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "Hostitel není v síti (%(network_id)s) nastaven."
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, fuzzy, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr "Síť %s má aktivní porty, nelze smazat"
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "Nelze najít odkazy datového úložiště, který VM používá."
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "Žádná pevná IP není spojena s %(id)s."
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Pevná ip není pro adresu %(address)s nalezena."
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr "Instance %(instance_id)s má nula pevných ip."
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "Síťový hostitel %(host)s má nula pevných ip v síti %(network_id)s."
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr "Instance %(instance_id)s nemá pevnou ip '%(ip)s'."
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr "Hostitel %(host)s má nula pevných ip."
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr "Pevná IP adresa (%(address)s) v síti (%(network_uuid)s) neexistuje."
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr "Pevná IP adresa (%(address)s) je již používána."
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Pevná IP adresa (%(address)s) je neplatná."
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr "Je dostupno nula pevných ip."
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr "Bylo nalezeno nula pevných ip."
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Plovoucí ip není nalezena pro id %(id)s."
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "Záznam DNS %(name)s již v doméně %(domain)s existuje."
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Plovoucí ip nenalezeno pro adresu %(address)s."
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Plovoucí ip nenalezeno pro hostitele %(host)s."
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr "Je dostupných nula plovoucích ip."
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr "Existuje nula plovoucích ip."
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Rozhraní %(interface)s nenalezeno."
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "Dvojice klíčů %(name)s nenalezena pro uživatele %(user_id)s"
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Certifikát %(certificate_id)s nenalezen."
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Hostitel %(host)s nemohl být nalezen."
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Hostitel výpočtu %(host)s nemohl být nalezen."
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Nelze najít binární soubor %(binary)s v hostiteli %(host)s."
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr "Známka oprávnění %(token)s nemohla být nalezena."
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr "Přístupový klíč %(access_key)s nemohl být nalezen."
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr "Kvóta nemohla být nalezena."
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Bezpečnostní skupina %(security_group_id)s není nalezena."
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "Bezpečnostní skupina %(security_group_id)s není nalezena v projektu "
 "%(project_id)s."
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Bezpečnostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -747,7 +756,7 @@ msgstr ""
 "Bezpečnostní skupina %(security_group_id)s je již přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -756,22 +765,22 @@ msgstr ""
 "Bezpečnostní skupina %(security_group_id)s není přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Přesun %(migration_id)s nemohl být nalezen."
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Přesun nenalezen v instanci %(instance_id)s se stavem %(status)s."
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Zásoba konzole %(pool_id)s nemohla být nalezena."
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -780,17 +789,17 @@ msgstr ""
 "Zásoba konzole typu %(console_type)s pro výpočetního hostitele "
 "%(compute_host)s v hostitele proxy %(host)s nemohla být nalezena."
 
-#: nova/exception.py:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Konzole %(console_id)s nemohla být nalezena."
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr "Konzole pro instanci %(instance_id)s nemohla být nalezena."
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
@@ -799,56 +808,63 @@ msgstr ""
 "Konzole pro instanci %(instance_id)s v zásobě %(pool_id)s nemohla být "
 "nalezena."
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Neplatná konzole typu %(console_type)s "
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr "Nalezeno nula typů instancí."
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Instance typu %(instance_type_id)s nemohla být nalezena."
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Instance typu s názvem %(instance_type_name)s nemohla být nalezena."
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Konfigurace %(flavor_id)s nemohla být nalezena."
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr "Zóna %(zone_id)s nemohla být nalezena."
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Filtr hostitelů plánovače %(filter_name)s nemohl být nalezen."
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr "Funkce nákladů plánovače %(cost_fn_str)s nemohla být nalezena."
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr "Příznak váhy plánovače nemohl být nalezen: %(flag_name)s"
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr "Instance %(instance_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, fuzzy, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr "Instance %(instance_id)s nemá žádná metadata s klíčem %(metadata_key)s."
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -857,266 +873,292 @@ msgstr ""
 "Instance typu %(instance_type_id)s nemá žádné dodatečné specifikace s "
 "klíčem %(extra_specs_key)s."
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr "Objekt LDAP nemohl být nalezen"
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr "Uživatel LDAP %(user_id)s nemohl být nalezen."
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr "Skupina LDAP %(group_id)s nemohla být nalezena."
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr "Uživatel LDAP %(user_id)s není členem skupiny %(group_id)s."
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Soubor %(file_path)s nemohl být nalezen."
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr "Nalezeno nula souborů."
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "Nenalezen virtuální přepínač sdružený se síťovým adaptérem %(adapter)s."
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Síťový adaptér %(adapter)s nemohl být nalezen."
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr "Činnost není povolena."
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr "Nelze použít globální roli %(role_id)s"
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr "Střídání není povoleno pro snímky"
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr "Parametr rotation je vyžadován pro backup image_type"
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "Dvojice klíčů %(key_name)s již existuje."
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr "Uživatel %(user)s již existuje."
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr "LDAP uživatel %(user)s již existuje."
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr "LDAP skupina %(group)s již existuje."
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "Uživatel %(uid)s již je členem skupiny %(group_dn)s"
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr "Projekt %(project)s již existuje."
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s již existuje."
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "Typ svazku %(name)s již existuje."
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr "Chyba přesunu"
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Poškozené tělo zprávy: %(reason)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Nelze najít nastavení v %(path)s"
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Nelze načíst aplikaci vložení '%(name)s' z %(path)s"
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr "Při změně velikosti ji musí instance změnit také!"
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr "Obraz je větší než typ instance povoluje"
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr "1 nebo více Zón nemohlo požadavek dokončit"
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr "Typ paměti instance je pro požadovaný obraz příliš malý."
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr "Typ disku instance je pro požadovaný obraz příliš malý."
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Pro spuštění %(uuid)s je v uzlu výpočtu nedostatek volné paměti."
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Nelze získat metriky šířky pásma/procesoru/disku pro tohoto hostitele."
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Hostitel %(host)s není dostupný nebo neexistuje."
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr "Kvóta překročena"
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, fuzzy, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr "Překročena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, fuzzy, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr "Vybrán maximální počet hostitelů (%d)"
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr "Překročen limit osobnostního souboru"
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr "Cesta osobnostního souboru je příliš dlouhá"
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr "Obsah osobnostního souboru je příliš dlouhý"
+
+#: nova/exception.py:997
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr "Agregát %(aggregate_id)s nemá hostitele %(host)s."
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Agregát %(aggregate_id)s nemohl být nalezen."
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Agregát %(aggregate_name)s již existuje."
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "Agregát %(aggregate_id)s nemá hostitele %(host)s."
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "Agregát %(aggregate_id)s nemá žádná metadata s klíčem %(metadata_key)s."
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr "Hostitel %(host)s již je členem jiného agregátu."
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "Agregát %(aggregate_id)s již má hostitele %(host)s."
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, fuzzy, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "Zjištěn více než jeden svazek s názvem %(vol_name)"
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 "Nelze vytvořit typ_svazku s názvem %(name)s a specifikacemi "
 "%(extra_specs)s"
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr "Nelze vytvořit typ instance"
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr "Špatná odpověď od SolidFire API"
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr "Chyba v odpovědi SolidFire API: stav=%(status)s"
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "Chyba v odpovědi SolidFire API: data=%(data)s"
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Zjišťěna existující vlan s id %(vlan)"
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
-msgstr "Kernel nenalezen v obrazu %(image_id)s."
+msgstr "Získávání obrazu %(image)s"
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "zařízení záznamu systému musí být jedno z: %s"
@@ -1142,250 +1184,251 @@ msgstr "Chyba při %(full_task_name)s: %(e)s"
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Oznamování schopností plánovačům ..."
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr "Soubor JSON představující zásady"
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr "Kontrolované pravidlo, když požadované není nalezeno"
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "Začínající uzel %(topic)s (verze %(vcs_string)s)"
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "Vytváření připojení zákazníka pro službu %s"
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr "Ukončena služba bez záznamu v databázi"
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "Objekt databáze služby zmizel, je znovu vytvářen."
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr "Obnoveno připojení modelového serveru!"
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr "modelový server je nedostupný"
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "Úplná sada PŘÍZNAKŮ:"
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr "%(flag)s : SADA PŽÍZNAKŮ "
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "Vnitřní výjimka: %s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "Získávání %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Získány neznámé argumenty klíčového slova pro utils.execute: %r"
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Spouštění příkazu (podproces): %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "Výsledek byl %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r selhalo. Opakování."
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Spouštění příkazu (SSH): %s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr "Prostředí není podporováno přes SSH"
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr "process_input není podporován přes SSH"
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "ladění ve zpětném volání: %s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Adresa místního spojení nenalezena.: %s"
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Nelze získat IP místního spojení %(interface)s :%(ex)s"
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Neplatná podpůrná vrstva: %s"
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr "podpůrná vrstva: %s"
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr "v opakujícím volání"
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, fuzzy, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Pokus získat semafor \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, fuzzy, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Získán semafor \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, fuzzy, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Pokus o získání zámku souboru \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, fuzzy, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "Získán zámek souboru \"%(lock)s\" pro zámek metody \"%(method)s\""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Očekáván objekt typu: %s"
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Neplatný  server_string: %s"
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' trvalo %(total_time).2f sek"
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
-msgstr "Původní výjimka je zahozena"
+#: nova/utils.py:1318
+#, fuzzy, python-format
+msgid "Reloading cached file %s"
+msgstr "Odstraňování základního souboru: %s"
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "Třída %(fullname)s je zastaralá: %(msg)s"
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "Třída %(fullname)s je zastaralá"
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr "Funkce %(name)s v %(location)s je zastaralá: %(msg)s"
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "Funkce %(name)s v %(location)s je zastaralá"
 
-#: nova/utils.py:1651
-#, python-format
+#: nova/utils.py:1590
+#, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
-msgstr ""
+msgstr "Nelze odstranit kontejner: %s"
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr "%(name)s spuštěno v %(host)s:%(port)s"
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr "Zastavování serveru WSGI."
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr "Server WSGI byl zastaven."
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr "Musíte zavést __call__"
 
+#: nova/wsgi.py:377
+#, fuzzy, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr "Nelze načíst aplikaci vložení '%(name)s' z %(path)s"
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr "%(code)s: %(message)s"
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr "Obalovačchyb: %s"
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr "Příliš mnoho ověření selhalo."
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1394,114 +1437,114 @@ msgstr ""
 "Přístupový klíč %(access_key)s %(failures)d krát selhal při ověření a "
 "bude zablokován na %(lock_mins)d minut."
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr "Podpis není zadán"
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr "Přístupový klíč není zadán"
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr "Chyba při komunikaci s keystone"
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Selhání ověření: %s"
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "Požadavek na ověření pro %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr "činnost: %s"
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\thod: %(value)s"
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Neoprávnění požadavek pro ovladač=%(controller)s a činnost=%(action)s"
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "Vyvoláno InstanceNenalezena: %s"
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "Vyvoláno SvazekNenalezen: %s"
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "Vyvoláno SnímekNenalzen: %s"
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "Vyvoláno Nenalezeno: %s"
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr "Vyvoláno ChybaApiEC2: %s"
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "Vyvoláno DvojiceKlíčůExistuje: %s"
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "Vyvoláno NeplatnáHodnotaParametru: %s"
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "Vyvoláno NeplatnýROzsahPortů: %s"
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "Vyvoláno NeníOprávněno: %s"
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "Vyvoláno NeplatnáOperace: %s"
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Vyvolána neznámá chyba: %s"
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Vyvolána neznámá chyba: %s"
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr "Prostředí: %s"
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Vyskytla se neznámá chyba. Prosím zopakujte Váš požadavek."
 
@@ -1512,12 +1555,17 @@ msgstr ""
 "Nepodporovaný požadavek API: ovladač = %(controller)s, činnost = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Vytvořit snímek svazku %s"
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, fuzzy, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
@@ -1526,70 +1574,71 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Obsah je omezen na "
 "alfanumerické znaky, mezery, pomlčky a podtržítka."
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, fuzzy, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překračuje maximum "
 "255 znaků."
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr "Vytvořit dvojici klíčů %s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr "Imprtovat klíč %s"
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Smazat dvojici klíčů %s"
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 #, fuzzy, python-format
 msgid "Invalid CIDR"
 msgstr "Neplatný cidr %(cidr)s."
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Zrušit přístup bezpečnostní skupiny %s"
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Není dostatek parametrů k sestavení platného pravidla."
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr "Pro zadané parametry není žádné pravidlo."
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Povolit přístup bezpečnostní skupiny %s"
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Toto pravidlo již existuje ve skupině %s"
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
+#, fuzzy, python-format
 msgid "Quota exceeded, too many security group rules."
-msgstr ""
+msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
@@ -1598,7 +1647,7 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Obsah je omezen na "
 "alfanumerické znaky, mezery, pomlčky a podtržítka."
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
@@ -1607,155 +1656,155 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překračuje maximum "
 "255 znaků."
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Vytvořit bezpečnostní skupinu %s"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr "skupina %s již existuje"
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Smazat bezpečnostní skupinu %s"
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Vytvořit svazek ze snímku %s"
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Vytvořit svazek o %s GB"
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Připojit svazek %(volume_id)s k instanci %(instance_id)s na %(device)s"
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "vlastnost není podporována: %s"
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr "svz = %s\n"
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr "Přidělit adresu"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr "Uvolnit adresu %s"
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Přidělit adresu %(public_ip)s k instanci %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Oddělit adresu %s"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr "Obraz musí být dostupný"
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr "BUde spuštěno ukončování insatncí"
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Restratovat instanci %r"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr "Instance budou zastaveny"
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr "Instance budou spuštěny"
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr "Zrušení registrace obrazu %s"
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Obraz %(image_location)s registrován s id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr "uživatel nebo skupina nebyly zadány"
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr "podporována je pouze skupina \"all\""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr "operation_type musí být add nebo remove"
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Aktualizace publicity obrazu %s"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Nelze zastavit instanci za %d sek"
@@ -1796,39 +1845,6 @@ msgstr "Rozšíření %(ext_name)s: nelze rozšířit %(collection)s: Žádný t
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Rozšíření %(ext_name)s: rozšiřování zdroje %(collection)s"
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr "%(user_id)s nelze nalézt se známkou '%(token)s'"
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr "%(user_id)s musí být správcem nebo členem %(project_id)s"
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr "Požadavky o ověření musí být prováděny proti verzi kořenu (např. /v2)."
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr "Nelze najít %s v požadavku."
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr "'%s' úspěšně ověřeno"
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr "Uživatel nenalezen pomocí zadaného klíče API."
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr "Zadaný klíč API je platný, ale ne pro uživatele '%(username)s'"
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr "parametr limit musí být celé číslo"
@@ -1859,31 +1875,44 @@ msgstr "href %s neobsahuje verzi"
 msgid "Image metadata limit exceeded"
 msgstr "Metadata obrazu překračují limit"
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+#, fuzzy
+msgid "Invalid image metadata"
+msgstr "Neplatná metadata"
+
+#: nova/api/openstack/common.py:308
 #, fuzzy, python-format
 msgid "Converting nw_info: %s"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, fuzzy, python-format
 msgid "Converted networks: %s"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Nelze '%(action)s' zatímco instance je %(attr)s %(state)s"
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr "Instance je v neplatném stavu pro '%(action)s'"
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Odmítnutí žádosti o snímek, snímky jsou nyní zakázány"
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Snímky instance nejsou v současnosti povoleny."
 
@@ -1892,57 +1921,57 @@ msgstr "Snímky instance nejsou v současnosti povoleny."
 msgid "Loaded extension: %s"
 msgstr "Načteno rozšíření: %s"
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr "Název roz: %s"
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Přezdívká roz: %s"
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr "Popis roz: %s"
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Jmenný prostor roz: %s"
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Roz aktualizováno: %s"
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "Výjimka při načítání rozšíření: %s"
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr "Načítání rozšíření %s"
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "Volání továrny rozšíření %s"
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Nelze načít rozšížení %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Nelze načíst rozšíření %(classpath)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr "Nelze načíst rozšíření %(ext_name)s: %(exc)s"
@@ -2039,31 +2068,43 @@ msgstr "podtřídy musí zavádět construct()!"
 msgid "Initializing extension manager."
 msgstr "Zavádění správce rozšíření."
 
+#: nova/api/openstack/compute/flavors.py:101
+#, fuzzy, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr "Neplatný podpis pro uživatele %s"
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr "Obraz nenalezen"
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr "Nsprávný formát těla požadavku"
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr "Neshoda s tělem požadavku a URI"
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr "Tělo požadavku obsahuje příliš mnoho položek"
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr "Neplatný klíč metadata"
 
@@ -2090,218 +2131,205 @@ msgstr "Tento požadavek má omezen množství."
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr "Server neexistuje"
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr "Položka metadat nenalezena"
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr "Neplatný stav serveru: %(status)s"
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr "Neplatná hodnota changes-since"
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr "Překročen limit osobnostního souboru"
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr "Cesta osobnostního souboru je příliš dlouhá"
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr "Obsah osobnostního souboru je příliš dlouhý"
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr "Název serveru není řetězec nebo unicode"
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr "Název serveru je prázdný řetězec"
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 #, fuzzy
 msgid "Server name must be less than 256 characters."
 msgstr "Dvojice klíčů musí být dlouhá 1 až 255 znaků."
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "Špatný formát osobnosti: chybí %s"
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr "Špatný formát osobnosti"
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "Obsah osobnosti pro %s nemůže být dekódován"
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "Špatný formát sítí: uuid sítě není ve správném formátu (%s)"
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "Neplatná pevná IP adresa (%s)"
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "Duplicitní sítě (%s) nejosu povoleny"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Špatný formát sítě: chybí %s"
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr "Špatný formát sítě"
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr "Obsah uživatelských dat nemůže být dekódován"
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 není ve správném formátu IPv4"
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 #, fuzzy
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr "accessIPv4 není ve správném formátu IPv4"
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr "Název serveru není určen"
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr "Zadáno neplatné flavorRef."
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr "Nelze najít požadovaný obraz"
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr "Zadán neplatný název_klíče."
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr "Instanci nebyla změněna velikost."
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr "Chyba v confirm-resize %s"
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr "Chyba v revert-resize %s"
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "Argument 'type' pro restart není HARD či SOFT"
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr "Chybí argument 'type' pro restart"
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr "Chyba v restartu %s"
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr "Nelze najít požadovanou konfiguraci."
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr "Resize vyžaduje změnu velikosti."
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr "Poškozený objekt serveru"
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr "Chybí vlastnost imageRef"
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr "Zadáno neplatné imageRef."
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr "Chybí vlastnost flavorRef"
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr "Nebylo zadáno adminPass"
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr "Neplatné adminPass"
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr "Nelze zpracovat metadata dvojic hodnot/klíčů."
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti má neplatnou vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Požadavek na změnu velikosti vyžaduje vlastnost 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr "Neplatné tělo požadavku"
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr "Nelze zpracovat imageRef z požadavku."
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr "Instance nemohla být nalezena"
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr "Nelze najít obraz ke znovu sestavení"
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr "Objekt createImage cyžaduje vlastnost name"
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr "Neplatná metadata"
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "Odstraňování voleb '%(unk_opt_str)s' z fronty"
@@ -2377,7 +2405,6 @@ msgstr "Vlastnost createBackup 'rotation' musí být celé číslo"
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2407,9 +2434,9 @@ msgid "Cannot show aggregate: %(id)s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/aggregates.py:114
-#, python-format
+#, fuzzy, python-format
 msgid "Cannot update aggregate: %(id)s"
-msgstr ""
+msgstr "Nelze aktualizovat agenta: %(resp)r"
 
 #: nova/api/openstack/compute/contrib/aggregates.py:126
 #, python-format
@@ -2475,32 +2502,33 @@ msgid "Flavor not found."
 msgstr "Server nenalezen."
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr "Žádné tělo požadavku"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr "Žádné další plovoucí ip v zásobníku %s."
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr "Žádné další plovoucí ip nejsou dostupné."
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr "Chybí parametr dict"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr "Adresa není určena"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr "K instanci nejsou přidruženy žádné pevné ip"
 
@@ -2529,23 +2557,23 @@ msgstr "Nastavování hostitele %(host)s na %(state)s."
 msgid "Setting host %(host)s to %(state)s."
 msgstr "Nastavování hostitele %(host)s na %(state)s."
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource je funkce pouze pro správce"
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr "Hostitel nenalezen"
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Dvojice klíčů musí být dlouhá 1 až 255 znaků."
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr "Dvojice klíčů '%s' již existuje."
@@ -2597,115 +2625,124 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr "Poškozená vlasnost scheduler_hints"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Id bezpečnostní skupiny by mělo být celé číslo"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Bezpečnostní skupina %s již existuje"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "Bezpečnostní skupina %s není řetězec nebo unicode"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Bezpečnostní skupina %s nemůže být prázdná."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "Bezpečnostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr "Id nadřazené skupina není celé číslo"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr "Bezpečnostní skupina (%s) nenalezena"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr "Není dostatek parametrů k sestavení platného pravidla."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr "Toto pravidlo již existuje ve skupině %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr "Nadřazený nebo id skupiny není celé číslo"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr "Id pravidla není celé číslo"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Pravidlo (%s) nenalezeno"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr "Není zadána bezpečnostní skupina"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr "Název bezpečnostní skupiny nemůže být prázdné"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#, fuzzy, python-format
+msgid "start instance"
 msgstr "začátek instance %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+#, fuzzy, python-format
+msgid "stop instance"
 msgstr "zastavit instanci %r"
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr "svazek=%s"
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr "Smazat svazek s id: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr "Připojit svazek %(volume_id)s k instanci %(server_id)s na %(device)s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "instance %s: není zavedena"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr "Smazat snímek s id: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr "Vytvořit snímek ze svazku %s"
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr "Pokus o vytvoření instanci jedináčka"
@@ -2719,27 +2756,27 @@ msgstr ""
 "Pokus o odstranění posledního člena skupiny. Místo toho je smazána "
 "skupina v %s."
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Hledání uživatele: %r"
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Ověření selhalo pro přístupový klíč %s"
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Použití názvu projektu = jméno uživatele (%s)"
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr "ověření selhalo: žádný projekt s názvem %(pjid)s (uživatel=%(uname)s)"
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
@@ -2748,159 +2785,163 @@ msgstr ""
 "Ověření selhalo:  uživatel %(uname)s není správcem a není členem projektu"
 " %(pjname)s"
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr "uživatel_tajemství: %s"
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr "očekáváný_podpis: %s"
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr "podpis: %s"
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Neplatný podpis pro uživatele %s"
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr "pouze_podpis_hostitele: %s"
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr "Musíte zadat projekt"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "Přidávávání role %(role)s uživateli %(uid)s v projektu %(pid)s"
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr "Přidávání celosíťové role %(role)s uživateli %(uid)s"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr "Odstraňování role %(role)s uživatele %(uid)s v projektu %(pid)s"
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr "Odstraňování celosíťové role %(role)s uživatele %(uid)s"
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "Vytvořen projekt %(name)s se správcem %(manager_user)s"
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr "úprava projektu %s"
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Přidávání uživatele %(uid)s do projektu %(pid)s"
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Odstraňování uživatele %(uid)s z projektu %(pid)s"
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr "Mazání projektu %s"
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "Vytvořen uživatel %(rvname)s (admin: %(rvadmin)r)"
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr "Mazání uživatele %s"
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "Změna přístupového klíče uživatele %s"
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "Změna tajného klíče uživatele %s"
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "Stav správce nastaven na %(admin)r pro uživatele %(uid)s"
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "Žádná data vpn pro projekt %s"
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
 msgstr "Neplatná instance typu %(instance_type)s."
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr "Šablona pro zaváděcí skript instance cloudpipe"
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr "Síť kterou odeslat do nastavení openvpn"
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr "Síťovou masku kterou odeslat do nastavení openvpn"
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Spouštění VPN pro %s"
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr "Nezadán žádný počítačový hostitel"
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "Nelze najít hostitele pro instanci %s"
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "Překročena kvóta instancí. Nemůžete spustit další instance tohoto typu."
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Překročena kvóta instancí. Můžete spustit pouze %s dalších instancí "
 "tohoto typu."
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr "Překročena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -2909,79 +2950,86 @@ msgstr ""
 "Překročena kvóta pro %(pid)s, pokus o nastavení %(num_metadata)s "
 "vlastností metadat"
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
 msgstr ""
-"Překročena kvóta pro %(pid)s, hodnota nebo klíč vlastnosti metadat je "
-"příliš dlouhý"
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:229
+#, fuzzy, python-format
+msgid "Metadata property key greater than 255 characters"
+msgstr "Bezpečnostní skupina %s by neměla být větší než 255 znaků."
+
+#: nova/compute/api.py:233
+#, fuzzy, python-format
+msgid "Metadata property value greater than 255 characters"
+msgstr "Bezpečnostní skupina %s by neměla být větší než 255 znaků."
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Chystá se spuštění %s instancí..."
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr "Posílání vytvoření pro plánovače pro %(pid)s/%(uid)s"
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 #, fuzzy, python-format
 msgid "No host for instance, deleting immediately"
 msgstr "Žádný hostitel pro instnaci %s, okamžitě smazána"
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Pokus o ukončení %s"
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Pokus o zastavení %s"
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Pokus o spuštění %s"
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr "Instance %(instance_uuid)s není zastavena. (%(vm_state)s"
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "Hledání podle: %s"
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "Nerozpoznaný typ obrazu %s"
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id je None. Předpokládán přesun."
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -2990,7 +3038,7 @@ msgstr ""
 "Stará instance typu %(current_instance_type_name)s, nová instance typu "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr "existuje mnoho pevných ip, použita je první: %s"
@@ -3009,88 +3057,79 @@ msgstr "Chyba DB: %s"
 msgid "Instance type %s not found for deletion"
 msgstr "Instance typu %s není nalezena ke smazání"
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: zdobení: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 "check_instance_lock: argumenty: |%(self)s| |%(context)s| "
 "|%(instance_uuid)s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: uzamknuto: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: správce: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: spouštění: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: nespouštění |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "Nelze načíst ovladač virtualizace: %s"
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Současný stav je %(drv_state)s, stav v DB je %(db_state)s."
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Restartování instance po restartu nova-compute."
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Ovladač hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr "Kontrola stavu"
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Nastavování bdm %s"
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-#, fuzzy, python-format
-msgid "Exception encountered while terminating the instance"
-msgstr "vyjímka ukončující tuto instanci %(instance_uuid)s"
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy
 msgid "Instance not found."
 msgstr "Instance nenalezena"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "Instance již byla vytvořena"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3099,7 +3138,7 @@ msgstr ""
 "ID obrázku=%(image_id)s, velkost obrázku v bajtech=%(size_bytes)d, "
 "povoleno bajtů=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:526
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3108,79 +3147,79 @@ msgstr ""
 "Velikost %(size_bytes)d obrázku '%(image_id)s' překročila povolenou "
 "velkost %(allowed_size_bytes)d pro typ instance"
 
-#: nova/compute/manager.py:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr "Spouštění instance..."
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr "Přeskakování přidělení sítě pro instanci"
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr "Instance selhala v nastavení sítě"
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr "Instance selhala nastavení blokového zařízení"
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s nstance"
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr "ukončování bdm %s"
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Nastavování stavu vm instance na ERROR"
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 #, fuzzy, python-format
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 "Nelze znovu sestavit instanci [%(instance_uuid)s], protože zadaný obraz "
 "neexistuje."
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Nelze znovu sestavit instanci [%(instance_uuid)s]: %(exc)s"
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Znovu sestavování instance %s"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Restartování instance %s"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3189,12 +3228,12 @@ msgstr ""
 "pokus o restartování nespuštěné instance: %(instance_uuid)s (stav: "
 "%(state)s očekáváno: %(running)s)"
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: pořizování snímku"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3203,184 +3242,178 @@ msgstr ""
 "pokus o vytvoření snímku z nespuštěné instance: %(instance_uuid)s (stav: "
 "%(state)s očekáváno: %(running)s)"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Nalezeno %(num_images)d obrazů (střídání: %(rotation)d)"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Střídání %d záloh"
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr "Mazání obrazu %s"
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 #, fuzzy, python-format
 msgid "Root password set"
 msgstr "Instance %s: Nastavení hesla root"
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr "set_admin_password není tímto ovladačem zavedeno"
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr "Chyba při nastavování hesla správce"
 
-#: nova/compute/manager.py:1085
-#, python-format
+#: nova/compute/manager.py:1106
+#, fuzzy, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 "pokus o vsunutí souboru do nespuštěné instance: %(instance_uuid)s (stav: "
 "%(current_power_state)s očekáváno: %(expected_state)s)"
 
-#: nova/compute/manager.py:1090
-#, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
-msgstr "instance %(instance_uuid)s: vsunutí souboru do %(path)s"
+#: nova/compute/manager.py:1110
+#, fuzzy, python-format
+msgid "injecting file to %(path)s"
+msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/compute/manager.py:1104
-#, python-format
+#: nova/compute/manager.py:1124
+#, fuzzy, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 "pokus o aktualizaci agenta v nespuštěné instanci: %(instance_uuid)s "
 "(stav: %(current_power_state)s očekáváno: %(expected_state)s)"
 
-#: nova/compute/manager.py:1109
-#, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
-msgstr "instance %(instance_uuid)s: aktualizace agenta na %(url)s"
+#: nova/compute/manager.py:1128
+#, fuzzy, python-format
+msgid "updating agent to %(url)s"
+msgstr "Aktualizace agenta na %s"
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
-msgstr "instance %s: zachraňování"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
+msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+#, fuzzy, python-format
+msgid "Unrescuing"
 msgstr "instance %s: rušení záchrany"
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr "cíl stejný jako zdroj!"
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
-msgstr "instance %s: přesunování"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
+msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "instance %s: pozastavování"
+#: nova/compute/manager.py:1518
+#, fuzzy
+msgid "Pausing"
+msgstr "Aktualizování!"
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "instance %s: rušení pozastavení"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "instance %s: získávání diagnostik"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "instance %s: přerušování"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "instance %s: pokračování"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "instance %s: uzamykání"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "instance %s: odemykání"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+#, fuzzy, python-format
+msgid "Getting locked state"
 msgstr "instance %s: získávání uzamčeného stavu"
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
-msgstr "instance %s: reset sítě"
+#: nova/compute/manager.py:1647
+#, fuzzy
+msgid "Reset network"
+msgstr "Reset sítě"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+#, fuzzy, python-format
+msgid "Inject network info"
 msgstr "instance %s: vkládání informací o síti"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info vkládá: |%s|"
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+#, fuzzy, python-format
+msgid "Get console output"
+msgstr "Získat výstup konzole pro instanci %s"
+
+#: nova/compute/manager.py:1699
+#, fuzzy, python-format
+msgid "Getting vnc console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:1693
+#: nova/compute/manager.py:1727
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
 
-#: nova/compute/manager.py:1711
-#, fuzzy, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
-msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
-
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, fuzzy, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
-msgstr "Připojení selhalo %(mountpoint)s, odstraňování"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
+msgstr "Zavádění pomocí svazku %(volume_id)s ve %(mountpoint)s"
 
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr "Připojení selhalo %(mountpoint)s, odstraňování"
+#: nova/compute/manager.py:1764
+#, fuzzy, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "Připojování svazku %(volume_id)s do %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "Odpojování svazku %(volume_id)s z bodu připojení %(mp)s"
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
 msgstr "Odpojování svazku z neznámé instance %s"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -3389,35 +3422,35 @@ msgstr ""
 "Vytváření dočasného souboru %s pro informování ostatních počítačových "
 "uzlů, že by se měli připojit ke stejnému úložišti."
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr "Instance nemá svazek."
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 "plug_vifs() selhalo %(cnt)d.opakování až na %(max_retry)d pro "
 "%(hostname)s."
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "Přesun před spuštěním selhal na %(dest)s"
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr "zahájen přesun po spuštění."
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr "Nenalezeny žádné plovoucí ip."
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3426,12 +3459,12 @@ msgstr ""
 "Přesun za provozu: Neočekávaná chyba: nelze zdědit plovoucí ip.\n"
 "%(e)s"
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "Přesun instance do %(dest)s úspěšně dokončen."
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3439,24 +3472,23 @@ msgstr ""
 "Můžete vidět tuto chybu \"libvirt: QEMU error: Domain not found: no "
 "domain with matching name.\" Tuto chybu můžete bezpečně ignorovat."
 
-#: nova/compute/manager.py:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr "Spuštěna operace po migraci"
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr "Aktualizace stavu hostitele"
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3465,21 +3497,20 @@ msgstr ""
 "Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
 "hypervizoru."
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 #, fuzzy, python-format
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
@@ -3488,15 +3519,15 @@ msgstr ""
 "Instance %(name)s nalezena v databázi, ale je neznámá pro hypervizora. "
 "Stav napájení nastaven na NOSTATE"
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, překskování..."
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr "Znovu získávání smazané instance"
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, fuzzy, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
@@ -3505,7 +3536,7 @@ msgstr ""
 "Zjištěna instance se jmenovkou '%(name_label)s', která je označena jako "
 "SMAZÁNA, ale stále je přítomna na hostiteli."
 
-#: nova/compute/manager.py:2473
+#: nova/compute/manager.py:2503
 #, fuzzy, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
@@ -3514,29 +3545,29 @@ msgstr ""
 "Ničení instance se jmenovkou '%(name_label)s', která je označena jako "
 "SMAZÁNA, ale stále je přítomna na hostiteli."
 
-#: nova/compute/manager.py:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 "Nerozpoznaná hodnota '%(action)s' pro "
 "FLAGS.running_deleted_instance_action"
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr "Agregát %(aggregate_id)s již má hostitele %(host)s."
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "podsítě v4 jsou vyžadovány pro zastaralé nw_info"
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr "Přidávání konzole"
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr "Pokus o odstranění neexistující konzole %(console_id)s."
@@ -3581,17 +3612,17 @@ msgstr "Restartování xvp"
 msgid "xvp not running..."
 msgstr "xvp není spuštěno"
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr "Mazání vypršené známky: (%s)"
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr "Obdržena známka: %(token)s, %(token_dict)s)"
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "Kontrola známky: %(token)s, %(token_valid)s)"
@@ -3600,145 +3631,105 @@ msgstr "Kontrola známky: %(token)s, %(token_valid)s)"
 msgid "Use of empty request context is deprecated"
 msgstr "Použití prázdného kontextu požadavku je zastaralé"
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Nerozpoznaná hodnota read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr "Žádný počítačový uzel pro %(host)s"
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr "Žádné nastavení podpůrné vrstvy s id %(sm_backend_id)s"
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr "Žádná konfigurace sm s názvem %(sm_flavor)s"
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "Žádný svazek sm s id %(volume_id)s"
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
-msgstr "python-migrate není nainstalován. Ukončování."
-
-#: nova/db/sqlalchemy/migration.py:78
+#: nova/db/sqlalchemy/migration.py:74
 msgid "version should be an integer"
 msgstr "verze by měla být celé číslo"
 
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
 #: nova/db/sqlalchemy/session.py:137
 #, fuzzy, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr "Připojení SQL selhalo (%(connstring)s). Zbývá  %(attempts)d pokusů."
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr "Slouppec interface nepřidáno do tabulky networks"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr "Tabulka |%s| není vytvořena!"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr "Sloupec VIF nepřidán do tabulky fixed_ips"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr "přidat seznam pro pohybující se mac adresy |%s|"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr "omezení cizího klíče nemohlo být přidáno"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr "omezení cizího klíče nemohlo být vynecháno"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
-msgstr "sloupec priority nepřidán do tabulky networks"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#, fuzzy
+msgid "quota_classes table not dropped"
+msgstr "tabulka instance_info_caches nesmazána"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr "omezení cizího klíče nemohlo být odstraněno"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr "sloupec progress nepřidán do tabulky interfaces"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-"Nelze obsadit id konfigurace do celého čísla %s. Nastavte id do řetězce "
-"podobném celému číslu pro degradaci."
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr "tabulka instance_info_caches nesmazána"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr "Sloupec progress nepřidán do tabulky compute_nodes"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+#, fuzzy
+msgid "Foreign Key constraint couldn't be removed"
+msgstr "omezení cizího klíče nemohlo být odstraněno"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr "tabulka dns_domains nesmazána"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+#, fuzzy
+msgid "foreign key could not be dropped"
+msgstr "omezení cizího klíče nemohlo být vynecháno"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
 #, fuzzy
-msgid "quota_classes table not dropped"
-msgstr "tabulka instance_info_caches nesmazána"
+msgid "foreign key could not be created"
+msgstr "omezení cizího klíče nemohlo být odstraněno"
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr "Chyba připojení během kontaktování serveru glance, další pokus"
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr "Dosaženo maxima pokusů"
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr "Vytvářeí obrazu v Glance. Metadata předána v %s"
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr "Metadata po formátování pro Glance %s"
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr "Metadata navrácená z Gůlance formátovaná pro Base %s"
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr "Není vlastníkem obrazu"
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr "%(timestamp)s se neřídí žádnými z podpisů: %(iso_formats)s"
@@ -3797,21 +3788,21 @@ msgstr "Špatná předpona pro to_global_ipv6: %s"
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr "Špatné id projektu pro to_global_ipv6: %s"
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr "Tento ovladač podporuje pouze záznamy typu 'a'."
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "Pokus o odstranění řetězu %s, který neexistuje"
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "Neznámý řetěz: %r"
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
@@ -3820,96 +3811,101 @@ msgstr ""
 "Pokus o odstranění neexistujícího pravidla: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.použití úspěšně dokončeno"
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq vrhl výjimku %s"
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d je starý, znovu spouštění dnsmasq"
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "ukončení radvd vrhlo %s"
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d je starý, znovu spouštění radvd"
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Spouštění rozhraní VLAN %s"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Spouštění rozhraní Bridge pro %s"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, fuzzy, python-format
+msgid "Failed to add interface: %s"
+msgstr "Nelze pozastavit instanci"
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
-msgstr "ukončování bdm %s"
+msgstr "Zajišťování mostu %s"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
-msgstr "Chyba při spouštění xvp: %s"
+msgstr "Zajišťování mostu %s"
 
-#: nova/network/linux_net.py:1167
-#, python-format
+#: nova/network/linux_net.py:1173
+#, fuzzy, python-format
 msgid "Failed unplugging gateway interface '%s'"
-msgstr ""
+msgstr "Nelze při odpojení vif instance '%s'"
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr "Certifikát %(certificate_id)s nenalezen."
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr "Rozhraní %(interface)s nenalezeno"
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr "Přidělení plovoucí IP pro |%s|"
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr "Odebrání plovoucí IP pro |%s|"
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "Adresa |%(address)s| není přidělena"
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr "Adresa |%(address)s| není přidělena pro Váš projekt |%(project)s|"
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr "Pro %s překročena kvóta, pokus o přidělení adresy"
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3919,98 +3915,98 @@ msgstr ""
 "Nesoulad databáze: Doména DNS |%s| je registrována v Nova db, ale není "
 "viditelná plovoucímu ovladači DNS ani instančnímu. Bude ignorována."
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "Doména |%(domain)s| již existuje, změna zóny na |%(av_zone)s|."
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Doména |%(domain)s| již existuje, změna projektu na |%(project)s|."
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "%s odloučených zastaralých ip"
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr "nastavování hostitele sítě"
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr "přidělení sítě pro instanci |%s|"
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr "sítě získané pro instanci |%(instance_id)s|: |%(networks)s|"
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr "oddělení sítě pro instanci |%s|"
 
-#: nova/network/manager.py:1149
-#, python-format
+#: nova/network/manager.py:1175
+#, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 "dns zóna instance je %(domain)s|, která je v zóně dostupnosti |%(zone)s|."
 " Instance |%(instance)s| je v zóně |%(zone2)s|. Nebude vytvořen žádný "
 "záznam DNS."
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Vypůjčená IP |%(address)s|"
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "Vypůjčená IP %s není přidělena"
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "Vypůjčena IP |%s|, která není přidělena"
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Uvolněna IP |%(address)s|"
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "Uvolněna IP %s, která není přidělena"
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "Uvolněna IP %s, která nebyla vypůjčena"
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr "cidr je již používáno"
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existující supersítí "
 "(%(super)s)"
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -4019,22 +4015,22 @@ msgstr ""
 "požadovaný cidr (%(cidr)s) je v konfliktu s existujícím menším cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr "Síť již existuje!"
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Síť musí být odloučena od projektu %s před smazáním"
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "Suma mezi počtem sítí a spuštění vlan nemůže být větší než 4094"
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4076,35 +4072,35 @@ msgstr "Nelze kontaktovat server. Získána chyba: %s"
 msgid "unable to deserialize object of type = '%s'"
 msgstr "nelze deserializovat object typu = '%s'"
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr "Kvantový správce nepoužívá parametr 'multi_host'."
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr "Kvantový správce požaduje, aby na jedno volání byla vytvořena jedna síť"
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr "Kvantový správce nepoužívá parametr 'vlan_start'."
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr "Kvantový správce nepoužívá parametr 'vpn_start'."
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr "Kvantový správce nepoužívá parametr 'bridge'."
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr "Kvantový správce nepoužívá parametr 'bridge_interface'."
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr "Kvantový správce vyžaduje platnou adresu brány (.1)."
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
@@ -4113,12 +4109,12 @@ msgstr ""
 "Nelze najít existující kvantovou síť pro nájemce '%(q_tenant_id)s' s id "
 "sítě '%(quantum_net_id)s'"
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
@@ -4127,7 +4123,7 @@ msgstr ""
 "odloučení portu selhalo pro instanci: |%(instance_id)s|, id_portu: "
 "|%(port_id)s|"
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4183,73 +4179,73 @@ msgstr "Připojování rozhraní %(interface_id)s k síti %(net_id)s pro %(tenan
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr "Mazání portu %(port_id)s v síti %(net_id)s pro%(tenant_id)s"
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr "%s není v platných prioritách"
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr "Problém '%(e)s' se pokouší poslat do systému oznámení. Náklad=%(payload)s"
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr "Problém '%(e)s' se pokouší poslat do ovladače oznámení %(driver)s."
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr "rozbalený kontext: %s"
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "obdrženo: %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "pro zprávu není metoda: %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "Pro zprávu není metoda: %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr "Provádění asynchronního volání na %s ..."
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID je %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "Provádění asynchronního obsazení na %s ..."
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr "Provádění asynchronního obsazení rozvětvení..."
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -4258,16 +4254,16 @@ msgstr ""
 "Vzdálená chyba: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr "Při čekání na odpověď RPC vypršel časový limit."
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Volajícímu je vrácena výjimka: %s"
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4299,41 +4295,41 @@ msgstr ""
 "AMQP server na %(hostname)s:%(port)d je nedosažitelný: %(err_str)s. Další"
 " pokus za %(sleep_time)d vteřin."
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr "Nelze deklarovat spotřebitele pro téma '%(topic)s': %(err_str)s"
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr "Při čekání na odpověď RPC vypršel čas: %s"
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr "Nelze spotřebovat zprávu z fronty: %s"
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr "Nelze vydat zprávu do tématu '%(topic)s': %(err_str)s"
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, fuzzy, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr "Nelze se připojit k serveru AMQP: %s "
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr "Připojeno k serveru AMQP na %s"
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr "Znovu obnoveny fronty AMQP"
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4346,53 +4342,53 @@ msgstr "Běží odpovídající služba?"
 msgid "Could not find another compute"
 msgstr "Nelze najít další výpočet"
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr "Obsazena '%(method)s' do svazku '%(host)s'"
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr "Obsazena '%(method)s' do '%(host)s' výpočtu"
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr "Obsazena '%(method)s' do sítě '%(host)s'"
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr "Obsazena '%(method)s' do %(topic)s '%(host)s'"
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr "Musí být zaveden náhradní plán"
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr "Přesunutí bloku nemůže být použito ve sdíleném úložišti."
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "Přesunutí bloku nemůže být použito ve sdíleném úložišti."
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr "hostitel %(dest)s není kompatibilní s původním hostitelem %(src)s."
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4401,7 +4397,7 @@ msgstr ""
 "Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek paměti "
 "(hostitel:%(avail)s <= instance:%(mem_inst)s)"
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4461,98 +4457,98 @@ msgstr "Obdržena aktualizace služby %(service_name)s od %(host)s."
 
 #: nova/scheduler/host_manager.py:313
 msgid "host_manager only implemented for 'compute'"
-msgstr ""
+msgstr "host_manager zaveden pouze pro 'compute'"
 
 #: nova/scheduler/host_manager.py:323
 #, python-format
 msgid "No service for compute ID %s"
-msgstr ""
+msgstr "Žádná služba pro ID výpočtu %s"
 
-#: nova/scheduler/manager.py:85
-#, python-format
+#: nova/scheduler/manager.py:86
+#, fuzzy, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
-msgstr ""
+msgstr "Metoda ovladače %(driver_method)s chybí: %(e)s. Vrácení na schedule()"
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
-msgstr ""
+msgstr "Nelze naplánovat_%(method)s: %(ex)s"
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, fuzzy, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
-msgstr "Instance %(instance_uuid)s není zastavena. (%(vm_state)s"
+msgid "Setting instance to %(state)s state."
+msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
 
 #: nova/scheduler/scheduler_options.py:66
 #, python-format
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
-msgstr ""
+msgstr "Nelze vyhodnotit soubor voleb plánovače %(filename)s: '%(e)s'"
 
 #: nova/scheduler/scheduler_options.py:75
 #, python-format
 msgid "Could not decode scheduler options: '%(e)s'"
-msgstr ""
+msgstr "Nelze dekódovat volby plánovače: '%(e)s'"
 
 #: nova/scheduler/simple.py:87
 msgid "Not enough allocatable CPU cores remaining"
-msgstr ""
+msgstr "Nezbývá dostatek přidělitelných jader CPU"
 
 #: nova/scheduler/simple.py:137
 msgid "Not enough allocatable volume gigabytes remaining"
-msgstr ""
+msgstr "Nezbývá dostatek přidělitelných svazků gigabajtů"
 
 #: nova/scheduler/filters/core_filter.py:45
 msgid "VCPUs not set; assuming CPU collection broken"
-msgstr ""
+msgstr "VCPU nenastaveny; předpokládáno poškození sbírky CPU"
 
 #: nova/tests/fake_utils.py:72
 #, python-format
 msgid "Faking execution of cmd (subprocess): %s"
-msgstr ""
+msgstr "Předstírání spuštění příkazu (subprocess): %s"
 
 #: nova/tests/fake_utils.py:80
 #, python-format
 msgid "Faked command matched %s"
-msgstr ""
+msgstr "Předstíraný příkaz odpovídá %s"
 
 #: nova/tests/fake_utils.py:96
 #, python-format
 msgid "Faked command raised an exception %s"
-msgstr ""
+msgstr "Předstíraný příkaz způsobil výjimku %s"
 
 #: nova/tests/fake_utils.py:101
 #, python-format
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
-msgstr ""
+msgstr "Odpověď na předstíraný příkaz je stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
-msgstr ""
+msgstr "Prosím rozšiřte nepravý modul libvirt aby podporoval příznaky"
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
-msgstr ""
+msgstr "Prosím rozšiřte falešný modul libvirt aby podporoval tuto metodu ověření"
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
-msgstr ""
+msgstr "Spouštění instancí: %s"
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
-msgstr ""
+msgstr "Po ukončení instancí: %s"
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
-msgstr ""
+msgstr "Vnitřní chyba"
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
-msgstr ""
+msgstr "Po vynuceném ukončení instancí: %s"
 
 #: nova/tests/test_misc.py:92
 #, python-format
@@ -4560,132 +4556,133 @@ msgid ""
 "The following migrations are missing a downgrade:\n"
 "\t%s"
 msgstr ""
+"Následujícím přesunům chybí snížení na nižší verzi:\n"
+"\t%s"
 
 #: nova/tests/test_nova_manage.py:169
 msgid "id"
-msgstr ""
+msgstr "id"
 
 #: nova/tests/test_nova_manage.py:170
 msgid "IPv4"
-msgstr ""
+msgstr "IPv4"
 
 #: nova/tests/test_nova_manage.py:171
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #: nova/tests/test_nova_manage.py:172
 msgid "start address"
-msgstr ""
+msgstr "počáteční adresa"
 
 #: nova/tests/test_nova_manage.py:173
 msgid "DNS1"
-msgstr ""
+msgstr "DNS1"
 
 #: nova/tests/test_nova_manage.py:174
 msgid "DNS2"
-msgstr ""
+msgstr "DNS2"
 
 #: nova/tests/test_nova_manage.py:175
 msgid "VlanID"
-msgstr ""
+msgstr "VlanID"
 
 #: nova/tests/test_nova_manage.py:176
 msgid "project"
-msgstr ""
+msgstr "projekt"
 
 #: nova/tests/test_nova_manage.py:177
 msgid "uuid"
-msgstr ""
+msgstr "uuid"
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
-msgstr ""
+msgstr "Cíl %s přidělen"
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
-msgstr ""
+msgstr "Nelze potvrdit exportované id svazku: %s."
 
 #: nova/tests/test_volume_types.py:58
 #, python-format
 msgid "Given data: %s"
-msgstr ""
+msgstr "Zadaná data: %s"
 
 #: nova/tests/test_volume_types.py:59
 #, python-format
 msgid "Result data: %s"
-msgstr ""
+msgstr "Výsledná data: %s"
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
-msgstr ""
+msgstr "Vytváření souborů v %s pro simulaci agenta hosta"
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
-msgstr ""
+msgstr "Odstraňování souborů simulovaného agenta hosta v %s"
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, fuzzy, python-format
-msgid "Quota exceeded: code=%(code)s"
-msgstr "Kvóta překročena"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
+msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
 #, python-format
 msgid "_create: %s"
-msgstr ""
+msgstr "_vytvořit: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
 #, python-format
 msgid "_delete: %s"
-msgstr ""
+msgstr "_smazat: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
 #, python-format
 msgid "_get: %s"
-msgstr ""
+msgstr "_získat: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
 #, python-format
 msgid "_get_all: %s"
-msgstr ""
+msgstr "_získat_vše: %s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
-msgstr ""
+msgstr "_zkouška_vytvoření_snímku: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
-msgstr ""
+msgstr "test_snímek_vytvoření: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
-msgstr ""
+msgstr "test_snímek_vynucení_vytvoření: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
-msgstr ""
+msgstr "test_snímek_vynucení_vytvoření: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
-msgstr ""
+msgstr "zobrazení_test_snímku: resp=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
-msgstr ""
+msgstr "test_snímek_podrobnosti: resp_dict=%s"
 
 #: nova/tests/integrated/test_login.py:31
 #, python-format
 msgid "flavor: %s"
-msgstr ""
+msgstr "konfigurace: %s"
 
 #: nova/tests/integrated/api/client.py:38
 #, python-format
@@ -4694,392 +4691,402 @@ msgid ""
 "Status Code: %(_status)s\n"
 "Body: %(_body)s"
 msgstr ""
+"%(message)s\n"
+"Kód stavu: %(_status)s\n"
+"Tělo: %(_body)s"
 
 #: nova/tests/integrated/api/client.py:47
 msgid "Authentication error"
-msgstr ""
+msgstr "Chyba ověření"
 
 #: nova/tests/integrated/api/client.py:55
 msgid "Authorization error"
-msgstr ""
+msgstr "Chyba oprávnění"
 
 #: nova/tests/integrated/api/client.py:63
 msgid "Item not found"
-msgstr ""
+msgstr "Položka nenalezena"
 
 #: nova/tests/integrated/api/client.py:105
 #, python-format
 msgid "Doing %(method)s on %(relative_url)s"
-msgstr ""
+msgstr "Provádění %(method)s na %(relative_url)s"
 
 #: nova/tests/integrated/api/client.py:107
 #, python-format
 msgid "Body: %s"
-msgstr ""
+msgstr "Tělo: %s"
 
 #: nova/tests/integrated/api/client.py:125
 #, python-format
 msgid "%(auth_uri)s => code %(http_status)s"
-msgstr ""
+msgstr "%(auth_uri)s => kód %(http_status)s"
 
 #: nova/tests/integrated/api/client.py:151
 #, python-format
 msgid "%(relative_uri)s => code %(http_status)s"
-msgstr ""
+msgstr "%(relative_uri)s => kód %(http_status)s"
 
 #: nova/tests/integrated/api/client.py:161
 msgid "Unexpected status code"
-msgstr ""
+msgstr "Neočekávaný kód stavu"
 
 #: nova/tests/integrated/api/client.py:168
 #, python-format
 msgid "Decoding JSON: %s"
-msgstr ""
+msgstr "Dekódování JSON: %s"
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
-msgstr ""
+msgstr "Vnořená obdržela %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
-msgstr ""
+msgstr "Vnořená vrátila %s"
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
-msgstr ""
+msgstr "Podpůrná vrstva RPC nepodporuje časové limity"
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
-msgstr ""
+msgstr "Přijato %s"
 
 #: nova/virt/connection.py:85
 msgid "Failed to open connection to the hypervisor"
-msgstr ""
+msgstr "Nelze otevřít spojení s hypervizorem"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
-msgstr ""
+msgstr "Pro %s vytvořen záznam compute_service "
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
-msgstr ""
+msgstr "Záznam compute_service aktualizován pro %s "
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
-msgstr ""
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
+msgstr "Pokus o odfiltrování instance, která není filtrována"
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
-msgstr ""
+#, fuzzy, python-format
+msgid "Filters added to instance"
+msgstr "Filtry přidány do instance %s"
 
 #: nova/virt/firewall.py:139
 msgid "Provider Firewall Rules refreshed"
-msgstr ""
+msgstr "Pravidla firewallu poskytovatele obnovena"
 
 #: nova/virt/firewall.py:291
 #, python-format
 msgid "Adding security group rule: %r"
-msgstr ""
+msgstr "Přidávání pravidla bezpečnostní skupiny: %r"
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
-msgstr ""
+msgstr "Přidávání pravidla poskytovatele: %s"
 
 #: nova/virt/images.py:86
 msgid "'qemu-img info' parsing failed."
-msgstr ""
+msgstr "zpracování 'qemu-img info' selhalo."
 
 #: nova/virt/images.py:92
 #, python-format
 msgid "fmt=%(fmt)s backed by: %(backing_file)s"
-msgstr ""
+msgstr "fmt=%(fmt)s zálohováno: %(backing_file)s"
 
 #: nova/virt/images.py:104
 #, python-format
 msgid "Converted to raw, but format is now %s"
-msgstr ""
+msgstr "Převedeno na prosté, ale formát je nyní %s"
 
 #: nova/virt/vmwareapi_conn.py:105
 msgid ""
 "Must specify vmwareapi_host_ip,vmwareapi_host_username and "
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
+"Pro useconnection_type=vmwareapi musíte zadat "
+"vmwareapi_host_ip,vmwareapi_host_username a vmwareapi_host_password"
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
-msgstr ""
+msgstr "In vmwareapi:_create_session, obdržena tato výjimka: %s"
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
-msgstr ""
+msgstr "In vmwareapi:_call_method, obdržena tato výjimka: %s"
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
-msgstr ""
+msgstr "Úkol [%(task_name)s] %(task_ref)s stav: úspěch"
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
-msgstr ""
+msgstr "Úkol [%(task_name)s] %(task_ref)s stav: chyba %(error_info)s"
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
-msgstr ""
+msgstr "In vmwareapi:_poll_task, Obdržena tato chyba %s"
 
 #: nova/virt/baremetal/dom.py:93
 msgid "No domains exist."
-msgstr ""
+msgstr "Neexistují žádné domény."
 
 #: nova/virt/baremetal/dom.py:95
 #, python-format
 msgid "============= initial domains =========== : %s"
-msgstr ""
+msgstr "============= Počáteční domény =========== : %s"
 
 #: nova/virt/baremetal/dom.py:99
 msgid "Building domain: to be removed"
-msgstr ""
+msgstr "Sestavování domény: bude odstraněna"
 
 #: nova/virt/baremetal/dom.py:103
 msgid "Not running domain: remove"
-msgstr ""
+msgstr "Nespouštění domény: odstraňování"
 
 #: nova/virt/baremetal/dom.py:111
 msgid "domain running on an unknown node: discarded"
-msgstr ""
+msgstr "doména běží v neznámém režimu: zahozena"
 
 #: nova/virt/baremetal/dom.py:127
 #, python-format
 msgid "No such domain (%s)"
-msgstr ""
+msgstr "Žádná taková doména (%s)"
 
 #: nova/virt/baremetal/dom.py:134
 #, python-format
 msgid "Failed power down Bare-metal node %s"
-msgstr ""
+msgstr "Nelze vypnout uzel Bare-metal %s"
 
 #: nova/virt/baremetal/dom.py:143
 msgid "deactivate -> activate fails"
-msgstr ""
+msgstr "deaktivace -> aktivace selhala"
 
 #: nova/virt/baremetal/dom.py:153
 msgid "destroy_domain: no such domain"
-msgstr ""
+msgstr "destroy_domain: žádná taková doména"
 
 #: nova/virt/baremetal/dom.py:154
 #, python-format
 msgid "No such domain %s"
-msgstr ""
+msgstr "Žádná taková doména %s"
 
 #: nova/virt/baremetal/dom.py:161
 #, python-format
 msgid "Domains: %s"
-msgstr ""
+msgstr "Domény: %s"
 
 #: nova/virt/baremetal/dom.py:163
 #, python-format
 msgid "Nodes: %s"
-msgstr ""
+msgstr "Uzle: %s"
 
 #: nova/virt/baremetal/dom.py:166
 #, python-format
 msgid "After storing domains: %s"
-msgstr ""
+msgstr "Po uložení domén: %s"
 
 #: nova/virt/baremetal/dom.py:169
 msgid "deactivation/removing domain failed"
-msgstr ""
+msgstr "deaktivace/odstranění domény selhalo"
 
 #: nova/virt/baremetal/dom.py:176
 msgid "===== Domain is being created ====="
-msgstr ""
+msgstr "===== Doména je vytvářena ====="
 
 #: nova/virt/baremetal/dom.py:179
 msgid "Same domain name already exists"
-msgstr ""
+msgstr "Doména se stejným názvem již existuje"
 
 #: nova/virt/baremetal/dom.py:181
 msgid "create_domain: before get_idle_node"
-msgstr ""
+msgstr "create_domain: před get_idle_node"
 
 #: nova/virt/baremetal/dom.py:198
 #, python-format
 msgid "Created new domain: %s"
-msgstr ""
+msgstr "Vytvořena nová doména: %s"
 
 #: nova/virt/baremetal/dom.py:213
 #, python-format
 msgid "Failed to boot Bare-metal node %s"
-msgstr ""
+msgstr "Nelze zavést uzel Bare-metal %s"
 
 #: nova/virt/baremetal/dom.py:222
 msgid "No such domain exists"
-msgstr ""
+msgstr "Žádná taková doména neexistuje"
 
 #: nova/virt/baremetal/dom.py:226
 #, python-format
 msgid "change_domain_state: to new state %s"
-msgstr ""
+msgstr "změna_stavu_domény: do nového stavu %s"
 
 #: nova/virt/baremetal/dom.py:233
 #, python-format
 msgid "Stored fake domains to the file: %s"
-msgstr ""
+msgstr "Falešné domény uloženy do souboru: %s"
 
 #: nova/virt/baremetal/dom.py:244
 msgid "domain does not exist"
-msgstr ""
+msgstr "doména neexistuje"
 
 #: nova/virt/baremetal/nodes.py:42
 #, python-format
 msgid "Unknown baremetal driver %(d)s"
-msgstr ""
+msgstr "Neznámý ovladač baremetal: %(d)s"
 
 #: nova/virt/baremetal/proxy.py:139
 #, python-format
 msgid "Error encountered when destroying instance '%(name)s': %(ex)s"
-msgstr ""
+msgstr "Při ničení instance '%(name)s' nastala chyba: %(ex)s"
 
 #: nova/virt/baremetal/proxy.py:153
 #, python-format
 msgid "instance %(instance_name)s: deleting instance files %(target)s"
-msgstr ""
+msgstr "instance %(instance_name)s: mazání souborů instance %(target)s"
 
 #: nova/virt/baremetal/proxy.py:180
 #, python-format
 msgid "instance %s: rebooted"
-msgstr ""
+msgstr "instance %s: znovu zavedena"
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
-msgstr ""
+msgstr "_wait_for_reboot selhalo"
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
-msgstr ""
+msgstr "instance %s: zachráněna"
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
-msgstr ""
+msgstr "_wait_for_rescue selhala"
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
-msgstr ""
+msgstr "<============= spuštěno z baremetal =============>"
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
-msgstr ""
+msgstr "instance %s: je sestavována"
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
-msgstr ""
+msgstr "Klíč je vložen, ale instance ještě není spuštěna"
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
-msgstr ""
+msgstr "instance %s: zavedena"
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
-msgstr ""
+msgstr "~~~~~~ současný stav = %s ~~~~~~"
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
-msgstr ""
+msgstr "instance %s úspěšn spuštěna"
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
-msgstr ""
+msgstr "instance %s: není zavedena"
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
-msgstr ""
+msgstr "Přidělení Bremetal je přeodevzdáno."
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
-msgstr ""
+msgstr "instance %s: Vytváření obrazu"
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
-msgstr ""
+msgstr "instance %(inst_name)s: vkládání %(injection)s do obrazu %(img_id)s"
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
+"instance %(inst_name)s: ignorování chyby při vkládání dat do obrazu "
+"%(img_id)s (%(e)s)"
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
-msgstr ""
+msgstr "instance %s: spoučtění metody toXML"
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
-msgstr ""
+msgstr "instance %s: dokončena metoda toXML"
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
+"Nelze získat počet cpu, protože tato funkce není na této platformě "
+"zavedena. Tuto chybu lze prozatím bezpečně ignorovat."
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
-msgstr ""
+msgstr "#### RLK: cpu_arch = %s "
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
-msgstr ""
+msgstr "Aktualizování!"
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
-msgstr ""
+msgstr "Aktualizace statistik hostitele"
 
 #: nova/virt/baremetal/tilera.py:185
 msgid "free_node...."
-msgstr ""
+msgstr "free_node...."
 
 #: nova/virt/baremetal/tilera.py:216
-#, python-format
+#, fuzzy, python-format
 msgid "deactivate_node is called for node_id = %(id)s node_ip = %(ip)s"
 msgstr ""
+"deactivate_node je zavolán pro                node_id = %(id)s node_ip = "
+"%(ip)s"
 
 #: nova/virt/baremetal/tilera.py:221
 msgid "status of node is set to 0"
-msgstr ""
+msgstr "stav uzlu je nastaven na 0"
 
 #: nova/virt/baremetal/tilera.py:232
 msgid "rootfs is already removed"
-msgstr ""
+msgstr "rootfs již je odstraněn"
 
 #: nova/virt/baremetal/tilera.py:264
 msgid "Before ping to the bare-metal node"
-msgstr ""
+msgstr "Ped ping na uzel bare-metal"
 
 #: nova/virt/baremetal/tilera.py:275
 #, python-format
@@ -5097,42 +5104,42 @@ msgstr ""
 
 #: nova/virt/baremetal/tilera.py:314
 msgid "activate_node"
-msgstr ""
+msgstr "activate_node"
 
 #: nova/virt/baremetal/tilera.py:328
 msgid "Node is unknown error state."
-msgstr ""
+msgstr "Uzel je v neznámém chybovém stavu."
 
 #: nova/virt/disk/api.py:165
 msgid "no capable image handler configured"
-msgstr ""
+msgstr "není nastavena žádná schopná obslužná rutina obrazu"
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
-msgstr ""
+msgstr "neznámá obslužná rutina obrazu disku: %s"
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
-msgstr ""
+msgstr "obraz již je připojen"
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
-msgstr ""
+msgstr "Nelze připojit souborový systém: %s"
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
-msgstr ""
+msgstr "Nelze odstranit kontejner: %s"
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5140,224 +5147,239 @@ msgstr ""
 #: nova/virt/disk/guestfs.py:39
 #, python-format
 msgid "unsupported partition: %s"
-msgstr ""
+msgstr "nepodporovaný oddíl: %s"
 
 #: nova/virt/disk/guestfs.py:77
 msgid "unknown guestmount error"
-msgstr ""
+msgstr "neznámá chyby připojení hosta"
 
 #: nova/virt/disk/loop.py:30
 #, python-format
 msgid "Could not attach image to loopback: %s"
-msgstr ""
+msgstr "Nelze připojit obraz do zpětné smyčky: %s"
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:78
+#, fuzzy, python-format
+msgid "partition %s not found"
+msgstr "nenalezeny žádné oddíly"
+
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
-msgstr ""
+msgstr "Nelze mapovat oddíly: %s"
 
 #: nova/virt/disk/nbd.py:58
 msgid "nbd unavailable: module not loaded"
-msgstr ""
+msgstr "nbd nedostupné: modul nenačten"
 
 #: nova/virt/disk/nbd.py:63
 msgid "No free nbd devices"
-msgstr ""
+msgstr "Žádná volná zařízení nbd"
 
 #: nova/virt/disk/nbd.py:81
 #, python-format
 msgid "qemu-nbd error: %s"
-msgstr ""
+msgstr "chyba qemu-nbd: %s"
 
 #: nova/virt/disk/nbd.py:93
 #, python-format
 msgid "nbd device %s did not show up"
-msgstr ""
+msgstr "zařízení nbd %s se nezobrazilo"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
-msgstr ""
+msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
-msgstr ""
+msgstr "Připojení k libvirt poškozeno"
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
-msgstr ""
+msgstr "Chyba od libvirt během ničení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
+"Chyba od libvirt během odstraňování uložení instance. Kód=%(errcode)s "
+"Chyba=%(e)s"
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
-msgstr ""
+msgstr "Chyba od libvirt během rušení určení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
-msgstr ""
+msgstr "Instance úspěšně zničena."
 
-#: nova/virt/libvirt/connection.py:438
-#, python-format
+#: nova/virt/libvirt/connection.py:450
+#, fuzzy, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
-msgstr ""
+msgstr "Chyba od libvirt během rušení určení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
-msgstr ""
+msgstr "Mazání souborů instance %(target)s"
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
-msgstr ""
+msgstr "Nelze zjistit název zavaděče iscsi"
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
-msgstr ""
+msgstr "připojování bloku zařízení LXC"
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
-msgstr ""
+msgstr "odpojování bloku zařízení LXC"
 
-#: nova/virt/libvirt/connection.py:695
-#, fuzzy, python-format
+#: nova/virt/libvirt/connection.py:708
+#, fuzzy
 msgid "Instance soft rebooted successfully."
-msgstr "Přesun instance do %(dest)s úspěšně dokončen."
+msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/libvirt/connection.py:728
-#, fuzzy, python-format
+#: nova/virt/libvirt/connection.py:741
+#, fuzzy
 msgid "Instance shutdown successfully."
-msgstr "Přesun instance do %(dest)s úspěšně dokončen."
+msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
-msgstr ""
+msgstr "Během restartu zmizela instance"
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
-msgstr ""
+msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
+"Nalezeno %(migration_count)d nepotvrzených přesunů starších než "
+"%(confirm_window)d vteřin"
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
-msgstr ""
+msgstr "Automatické potvrzení instance %d"
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
-msgstr ""
+msgstr "Instance je spuštěna"
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
+#, fuzzy
 msgid "During spawn, instance disappeared."
-msgstr ""
+msgstr "Během restartu zmizela instance"
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
-msgstr ""
+msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
-msgstr ""
+msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
-msgstr ""
+msgstr "Vytváření obrazu"
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
-msgstr ""
+msgstr "Vkládání %(injection)s do obrazu %(img_id)s"
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
-msgstr ""
+msgstr "Ignorování chyby při vkládání dat do obrazu %(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
-msgstr ""
+msgstr "block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
-msgstr ""
+msgstr "Spuštění metody toXML"
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
-msgstr ""
+msgstr "Metoda toXML dokočena"
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
+"Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
+"%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
-msgstr ""
+msgstr "verze libvirt je příliš stará (nepodporuje getVersion)"
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
-msgstr ""
+msgstr "'<cpu>' musí být 1, ale %d\n"
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
-msgstr ""
+msgstr "topologie (%(topology)s) musí být %(ks)s"
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
+"Spuštěná instance má info o CPU:\n"
+"%s"
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5366,225 +5388,264 @@ msgid ""
 "\n"
 "Refer to %(u)s"
 msgstr ""
+"CPU nemá kompatibilitu.\n"
+"\n"
+"%(ret)s\n"
+"\n"
+"Prohlédněte si %(u)s"
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
-msgstr ""
+msgstr "Při přesunu %s vypršel časový limit. nwfilter nenalezen."
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
-msgstr ""
+msgstr "přeskakování %(path)s protože vypadá jako svazek"
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
-msgstr ""
+#: nova/virt/libvirt/connection.py:2472
+#, fuzzy, python-format
+msgid "Starting migrate_disk_and_power_off"
+msgstr "Instance %s: Spouštění přesunu disku a vypnutí"
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
+#, fuzzy, python-format
 msgid "During wait running, instance disappeared."
-msgstr ""
+msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 #, fuzzy, python-format
 msgid "Instance running successfully."
-msgstr "Přesun instance do %(dest)s úspěšně dokončen."
+msgstr "Instance %s úspěšně běží."
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
-msgstr ""
+#: nova/virt/libvirt/connection.py:2538
+#, fuzzy, python-format
+msgid "Starting finish_migration"
+msgstr "Instance %s: Spouštění dokončení přesunu"
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
-msgstr ""
+#: nova/virt/libvirt/connection.py:2577
+#, fuzzy, python-format
+msgid "Starting finish_revert_migration"
+msgstr "Instance %s: Spuštění dokočení vrácení přesunu"
 
 #: nova/virt/libvirt/firewall.py:42
 msgid ""
 "Libvirt module could not be loaded. NWFilterFirewall will not work "
 "correctly."
 msgstr ""
+"Modul libvirt nemohl být nalezen. NWFilterFirewall nebude správně "
+"fungovat."
 
 #: nova/virt/libvirt/firewall.py:93
 msgid "Called setup_basic_filtering in nwfilter"
-msgstr ""
+msgstr "Voláno základní nastavení filtrování v nwfilter"
 
 #: nova/virt/libvirt/firewall.py:101
 msgid "Ensuring static filters"
-msgstr ""
+msgstr "Zajišťování statických filtrů"
 
 #: nova/virt/libvirt/firewall.py:171
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) is not found."
-msgstr ""
+msgstr "Nwfilter (%(instance_filter_name)s) nenalezen."
 
 #: nova/virt/libvirt/firewall.py:217
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
-msgstr ""
+msgstr "Nwfilter (%(instance_filter_name)s) pro %(name)s nenalezen."
 
 #: nova/virt/libvirt/firewall.py:233
 msgid "iptables firewall: Setup Basic Filtering"
-msgstr ""
+msgstr "iptables firewall: Nastavení základního filtrování"
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
-msgstr ""
+msgstr "%s je platný název instance"
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
-msgstr ""
+msgstr "%s má soubor disku"
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
-msgstr ""
+msgstr "Instance %(instance)s je zálohována %(backing)s"
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
+"Instance %(instance)s používá soubor zálohy %(backing)s, který se "
+"neobjevuje ve službě obrazu"
 
-#: nova/virt/libvirt/imagecache.py:237
-#, python-format
+#: nova/virt/libvirt/imagecache.py:227
+#, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
-msgstr ""
+msgstr "%(container_format)s-%(id)s (%(base_file)s):ověření obrazu selhalo"
 
-#: nova/virt/libvirt/imagecache.py:247
-#, python-format
+#: nova/virt/libvirt/imagecache.py:237
+#, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
+"%(container_format)s-%(id)s (%(base_file)s): ověření obrazu přeskočeno, "
+"žádný hash neuložen"
 
-#: nova/virt/libvirt/imagecache.py:266
-#, python-format
+#: nova/virt/libvirt/imagecache.py:256
+#, fuzzy, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
-msgstr ""
+msgstr "Nelze odstranit %(base_file)s, chyba byla %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
-msgstr ""
+msgstr "Základní souboru je příliš nový k odstranění: %s"
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
-msgstr ""
+msgstr "Odstraňování základního souboru: %s"
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
-msgstr ""
+msgstr "Nelze odstranit %(base_file)s, chyba byla %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:299
-#, python-format
+#: nova/virt/libvirt/imagecache.py:289
+#, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): checking"
-msgstr ""
+msgstr "%(container_format)s-%(id)s (%(base_file)s): kontrolování"
 
-#: nova/virt/libvirt/imagecache.py:318
-#, python-format
+#: nova/virt/libvirt/imagecache.py:308
+#, fuzzy, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
+"%(container_format)s-%(id)s (%(base_file)s): je používáno: v tomto uzlu "
+"%(local)d local, %(remote)d v ostatních uzlech"
 
-#: nova/virt/libvirt/imagecache.py:330
-#, python-format
+#: nova/virt/libvirt/imagecache.py:320
+#, fuzzy, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
+"%(container_format)s-%(id)s (%(base_file)s): varování -- je používán "
+"chybějící základní soubor! instance: %(instance_list)s"
 
-#: nova/virt/libvirt/imagecache.py:338
-#, python-format
+#: nova/virt/libvirt/imagecache.py:328
+#, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
+"%(container_format)s-%(id)s (%(base_file)s): v: ostatní uzly (%(remote)d "
+"v ostatních uzlech)"
 
-#: nova/virt/libvirt/imagecache.py:348
-#, python-format
+#: nova/virt/libvirt/imagecache.py:338
+#, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
-msgstr ""
+msgstr "%(container_format)s-%(id)s (%(base_file)s): obraz není používán"
 
-#: nova/virt/libvirt/imagecache.py:354
-#, python-format
+#: nova/virt/libvirt/imagecache.py:344
+#, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
-msgstr ""
+msgstr "%(container_format)s-%(id)s (%(base_file)s): obraz je používán"
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
-msgstr ""
+msgstr "Přeskakování oěření, žádný základní adresář v %s"
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
-msgstr ""
+msgstr "Ověřit základní obrazy"
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
-msgstr ""
+msgstr "Neznámý základní soubor: %s"
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
-msgstr ""
+msgstr "Aktivní základní soubory: %s"
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
-msgstr ""
+msgstr "Poškozené základní soubory: %s"
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
-msgstr ""
+msgstr "Odstranitelné základní soubory: %s"
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
-msgstr ""
+msgstr "Ověření dokončeno"
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
+msgstr "Nelze najít otevřený port"
+
+#: nova/virt/libvirt/utils.py:360
+#, fuzzy, python-format
+msgid "Reading image info file: %s"
+msgstr "Odstraňování základního souboru: %s"
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "_vytvořit: %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "Odstraňování základního souboru: %s"
+
+#: nova/virt/libvirt/utils.py:395
+#, fuzzy, python-format
+msgid "Wrote: %s"
+msgstr "Přepsáno %s"
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
-msgstr ""
+msgstr "Zajišťování vlan %(vlan)s a mostu %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
-msgstr ""
+msgstr "Zajišťování mostu %s"
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
-msgstr ""
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#, fuzzy, python-format
+msgid "Failed while unplugging vif"
+msgstr "Nelze při odpojení vif instance '%s'"
 
 #: nova/virt/libvirt/volume.py:163
 #, python-format
 msgid "iSCSI device not found at %s"
-msgstr ""
+msgstr "iSCSI zařízení v %s nenalezeno"
 
 #: nova/virt/libvirt/volume.py:166
 #, python-format
@@ -5592,153 +5653,162 @@ msgid ""
 "ISCSI volume not yet found at: %(mount_device)s. Will rescan & retry.  "
 "Try number: %(tries)s"
 msgstr ""
+"ISCSI svazek zatím v %(mount_device)s nenalezen:. Bude znovu provedeno "
+"hledání a další pokus. Číslo pokusu: %(tries)s"
 
 #: nova/virt/libvirt/volume.py:178
 #, python-format
 msgid "Found iSCSI node %(mount_device)s (after %(tries)s rescans)"
-msgstr ""
+msgstr "Nalezen uzel iSCSI %(mount_device)s (po %(tries)s pokusech)"
 
 #: nova/virt/vmwareapi/error_util.py:93
 #, python-format
 msgid "Error(s) %s occurred in the call to RetrieveProperties"
-msgstr ""
+msgstr "Při volání RetrieveProperties se událo %s chyb"
 
 #: nova/virt/vmwareapi/fake.py:44 nova/virt/xenapi/fake.py:77
 #, python-format
 msgid "%(text)s: _db_content => %(content)s"
-msgstr ""
+msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
-#, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
-msgstr ""
+#, fuzzy, python-format
+msgid "Property %(attr)s not set for the managed object %(name)s"
+msgstr "Vlastnost %(attr)s nenastavena pro spravovaný objekt %(objName)s"
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
-msgstr ""
+msgstr "Není registrováno žádné VM"
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
-msgstr ""
+msgstr "Virtuální stroj s ref %s neexistuje"
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
-msgstr ""
+msgstr "Odhlašování sezení, které je neplatné, nebo už odhlášené: %s"
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
-msgstr ""
+msgstr "Sezení je chybné"
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
-msgstr ""
+msgstr "Sezení je neplatné"
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
-msgstr ""
+msgstr " Žádné virtuální stroje nebyly zatím registrovány"
 
 #: nova/virt/vmwareapi/io_util.py:99
 #, python-format
 msgid "Glance image %s is in killed state"
-msgstr ""
+msgstr "Obraz Glance %s je ve stavu ukončení"
 
 #: nova/virt/vmwareapi/io_util.py:107
 #, python-format
 msgid "Glance image %(image_id)s is in unknown state - %(state)s"
-msgstr ""
+msgstr "Obraz Glance %(image_id)s je v nezámém stavu - %(state)s"
 
 #: nova/virt/vmwareapi/network_utils.py:128
 msgid ""
 "ESX SOAP server returned an empty port group for the host system in its "
 "response"
 msgstr ""
+"Server ESX SOAP vrátil ve své odpovědi prázdnou skupinu portů pro "
+"hostitelský systém"
 
 #: nova/virt/vmwareapi/network_utils.py:155
 #, python-format
 msgid "Creating Port Group with name %s on the ESX host"
-msgstr ""
+msgstr "Vytváření skupiny portů s názvem %s na hostiteli ESX"
 
 #: nova/virt/vmwareapi/network_utils.py:169
 #, python-format
 msgid "Created Port Group with name %s on the ESX host"
-msgstr ""
+msgstr "Vytvořena skupina portů s názvem %s na hostiteli ESX"
 
 #: nova/virt/vmwareapi/read_write_util.py:150
 #, python-format
 msgid "Exception during HTTP connection close in VMWareHTTpWrite. Exception is %s"
-msgstr ""
+msgstr "Během uzavření HTTP připojení v VMWareHTTpWrite došlo k výjimce %s"
 
 #: nova/virt/vmwareapi/vim.py:84
 msgid "Unable to import suds."
-msgstr ""
+msgstr "Nelze importovat suds."
 
 #: nova/virt/vmwareapi/vim.py:90
 msgid "Must specify vmwareapi_wsdl_loc"
-msgstr ""
+msgstr "Je třeba zadat vmwareapi_wsdl_loc"
 
 #: nova/virt/vmwareapi/vim.py:145
 #, python-format
 msgid "No such SOAP method '%s' provided by VI SDK"
-msgstr ""
+msgstr "Neexistuje žádná metoda SOAP '%s' poskytovaná VI SDK"
 
 #: nova/virt/vmwareapi/vim.py:150
 #, python-format
 msgid "httplib error in %s: "
-msgstr ""
+msgstr "chyba v httplib v %s: "
 
 #: nova/virt/vmwareapi/vim.py:157
 #, python-format
 msgid "Socket error in %s: "
-msgstr ""
+msgstr "Chyba soketu v %s: "
 
 #: nova/virt/vmwareapi/vim.py:162
 #, python-format
 msgid "Type error in  %s: "
-msgstr ""
+msgstr "Chyba typu v %s: "
 
 #: nova/virt/vmwareapi/vim.py:166
 #, python-format
 msgid "Exception in %s "
-msgstr ""
+msgstr "Výjimka v %s "
 
 #: nova/virt/vmwareapi/vmops.py:66
 msgid "Getting list of instances"
-msgstr ""
+msgstr "Získávání seznamu instancí"
 
 #: nova/virt/vmwareapi/vmops.py:82
 #, python-format
 msgid "Got total of %s instances"
-msgstr ""
+msgstr "Získáno celkem %s instancí"
 
 #: nova/virt/vmwareapi/vmops.py:126
 msgid "Couldn't get a local Datastore reference"
-msgstr ""
+msgstr "Nelze získat místní odkaz na datové úložiště"
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
-msgstr ""
+#, fuzzy, python-format
+msgid "Creating VM on the ESX  host"
+msgstr "Vytváření VM s názvem %s na hostiteli ESX"
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:204
+#, fuzzy, python-format
+msgid "Created VM on the ESX  host"
+msgstr "Vytvářeno VM s názvem %s na hostiteli ESX"
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
+"Vytváření virtuálního disku s velikostí %(vmdk_file_size_in_kb)s KB a "
+"typem adaptéru %(adapter_type)s na místním úložišti hostitele ESX "
+"%(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
 "local store %(data_store_name)s"
 msgstr ""
+"Vytvořen virtuální disk s velikostí %(vmdk_file_size_in_kb)s KB na "
+"místním úložišti hostitele ESX %(data_store_name)s"
 
 #: nova/virt/vmwareapi/vmops.py:260
 #, python-format
@@ -5746,310 +5816,336 @@ msgid ""
 "Deleting the file %(flat_uploaded_vmdk_path)s on the ESX host localstore "
 "%(data_store_name)s"
 msgstr ""
+"Mazání souboru %(flat_uploaded_vmdk_path)s na místním úložišti hostitele "
+"ESX %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
+"Soubor %(flat_uploaded_vmdk_path)s smazán na místním úložišti hostitele "
+"ESX %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
+"Stahování dat souboru obrazu %(image_ref)s na datové úložiště hostitele "
+"ESX %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
+"Data souboru obrazu %(image_ref)s stažena na datové úložiště hostitele "
+"ESX %(data_store_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:319
+#, fuzzy, python-format
+msgid "Reconfiguring VM instance to attach the image disk"
+msgstr "Znovu nastavování instance VM %s pro připojení obrazu disku"
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:326
+#, fuzzy, python-format
+msgid "Reconfigured VM instance to attach the image disk"
+msgstr "Instance VM %s znovu nastavena pro připojení obrazu disku"
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:333
+#, fuzzy, python-format
+msgid "Powering on the VM instance"
+msgstr "Zapínání instance VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:339
+#, fuzzy, python-format
+msgid "Powered on the VM instance"
+msgstr "Instance VM %s zapnuta"
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:385
+#, fuzzy, python-format
+msgid "Creating Snapshot of the VM instance"
+msgstr "Vytváření snímku instance VM %s "
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:395
+#, fuzzy, python-format
+msgid "Created Snapshot of the VM instance"
+msgstr "Snímek instance VM %s vytvořen "
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:438
+#, fuzzy, python-format
+msgid "Copying disk data before snapshot of the VM"
+msgstr "Kopírování data disku před snímek instance VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:451
+#, fuzzy, python-format
+msgid "Copied disk data before snapshot of the VM"
+msgstr "Data disku zkopírována před snímek instance VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
-msgstr ""
+msgstr "Nahrávání obrazu %s"
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
-msgstr ""
+msgstr "Obraz %s nahrán"
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
-msgstr ""
+msgstr "Mazání dočasného souboru vmdk %s"
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
-msgstr ""
+msgstr "Dočasný soubor vmdk %s smazán"
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
-msgstr ""
+msgstr "Instance není zapnuta"
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:533
+#, fuzzy, python-format
+msgid "Rebooting guest OS of VM"
+msgstr "Restartování OS hosta na VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:536
+#, fuzzy, python-format
+msgid "Rebooted guest OS of VM"
+msgstr "OS hosta restartován na VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:538
+#, fuzzy, python-format
+msgid "Doing hard reboot of VM"
+msgstr "Provádění tvrdho restártu VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:542
+#, fuzzy, python-format
+msgid "Did hard reboot of VM"
+msgstr "Proveden tvrdý restart VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
+msgstr "instance - %s není přítomno"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:573
+#, fuzzy, python-format
+msgid "Powering off the VM"
+msgstr "Vypínání VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:578
+#, fuzzy, python-format
+msgid "Powered off the VM"
+msgstr "VM %s vypnuto"
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:582
+#, fuzzy, python-format
+msgid "Unregistering the VM"
+msgstr "Rušení registrace VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:585
+#, fuzzy, python-format
+msgid "Unregistered the VM"
+msgstr "Registrace VM %s zrušena"
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
-msgstr ""
+msgstr "Ve vmwareapi:vmops:destroy, obdržena výjimka při rušení registrace VM: %s"
 
-#: nova/virt/vmwareapi/vmops.py:592
-#, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:599
+#, fuzzy, python-format
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
+msgstr "Mazání obsahu VM %(name)s z datového úložiště %(datastore_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:602
-#, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:609
+#, fuzzy, python-format
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
+msgstr "Smazán obsah VM %(name)s z datového úložiště %(datastore_name)s"
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
+"Ve vmwareapi:vmops:destroy, obdržena výjimka při mazání obsahu VM z "
+"disku: %s"
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
-msgstr ""
+msgstr "pozastavení není v vmwareapi popdorováno"
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
-msgstr ""
+msgstr "zrušení pozastavení není v vmwareapi popdorováno"
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:641
+#, fuzzy, python-format
+msgid "Suspending the VM"
+msgstr "Pozastavení VM %s "
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:645
+#, fuzzy, python-format
+msgid "Suspended the VM"
+msgstr "VM %s pozastaveno "
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
-msgstr ""
+msgstr "instance je vypnutá, proto nemůže být pozastavena."
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:651
+#, fuzzy, python-format
+msgid "VM was already in suspended state. So returning without doing anything"
+msgstr "VM %s již je v pozastaveném stavu. Návrat, aniž by se něco provedlo"
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:664
+#, fuzzy, python-format
+msgid "Resuming the VM"
+msgstr "Znovu spouštění VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:669
+#, fuzzy, python-format
+msgid "Resumed the VM"
+msgstr "VM %s znovu spuštěno "
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
-msgstr ""
+msgstr "instance není v pozastaveném stavu"
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
-msgstr ""
-
-#: nova/virt/vmwareapi/vmops.py:757
-#, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
-msgstr ""
+msgstr "get_diagnostics není zavedeno pro vmwareapi"
 
 #: nova/virt/vmwareapi/vmops.py:765
-#, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
+#, fuzzy, python-format
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
+msgstr ""
+"Znovu nastavování instance VM %(name)s pro úpravu id stroje s ip - "
 "%(ip_addr)s"
+
+#: nova/virt/vmwareapi/vmops.py:773
+#, fuzzy, python-format
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
+"Instance VM %(name)s znovu nastavena pro úpravu id stroje s ip - "
+"%(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
-msgstr ""
+msgstr "Vytváření adresáře s cestou %s"
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
-msgstr ""
+msgstr "Vytvořen adresář s cestou %s"
 
 #: nova/virt/vmwareapi/vmware_images.py:89
 #, python-format
 msgid "Downloading image %s from glance image server"
-msgstr ""
+msgstr "Stahování obrazu %s ze serveru obrazu glance"
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
-msgstr ""
+msgstr "Obraz %s stažen ze serveru obrazu glance"
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
-msgstr ""
+msgstr "Nahrávání obrazu %s na server obrazu glance"
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
-msgstr ""
+msgstr "Obraz %s nahrán na server obrazu glance"
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
-msgstr ""
+msgstr "Získávání velikosto brazu %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
-msgstr ""
+msgstr "Získáná velikost %(size)s obrazu %(image)s"
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
+"Pro použití connection_type=xenapi musíte zadat xenapi_connection_url, "
+"xenapi_connection_username (nepovinné), a xenapi_connection_password"
 
-#: nova/virt/xenapi/connection.py:461
-msgid "Host startup on XenServer is not supported."
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:353
+#, fuzzy, python-format
+msgid "Could not determine key: %s"
+msgstr "Nelze dešifrovat soukromý klíč: %s"
+
+#: nova/virt/xenapi/connection.py:486
+msgid "Host startup on XenServer is not supported."
+msgstr "Spuštění hostitele na XenServer není podporováno."
+
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
-msgstr ""
+msgstr "Nelze se přihlásit do XenAPI (je disk Dom0 plný?)"
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
-msgstr ""
+msgstr "Obdržena výjimka: %s"
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
-msgstr ""
+msgstr "Oznamování NotImplemented"
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
-msgstr ""
+msgstr "xenapi.fake nemá zavedeno %s"
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
-msgstr ""
+msgstr "Volání %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
-msgstr ""
+msgstr "Volání pro získání %s"
+
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "Volání pro získání %s"
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
 "with the wrong number of arguments"
-msgstr ""
+msgstr "xenapi.fake nemá zavedeno %s, nebo byl zavolán se špatným počtem argumentů"
 
 #: nova/virt/xenapi/host.py:67
 #, python-format
@@ -6061,12 +6157,12 @@ msgstr ""
 #: nova/virt/xenapi/host.py:137
 #, python-format
 msgid "Unable to get SR for this host: %s"
-msgstr ""
+msgstr "Nelze získat SR pro tohoto hostitele: %s"
 
 #: nova/virt/xenapi/host.py:169
-#, fuzzy
+#, fuzzy, python-format
 msgid "Unable to get updated status"
-msgstr "Nelze vytvořit typ instance"
+msgstr "Nelze získat aktualizovaný stav: %s"
 
 #: nova/virt/xenapi/host.py:172
 #, python-format
@@ -6076,17 +6172,17 @@ msgstr ""
 #: nova/virt/xenapi/network_utils.py:37
 #, python-format
 msgid "Found non-unique network for name_label %s"
-msgstr ""
+msgstr "Nalezena síť s názvem štítku %s, který není jedinečný"
 
 #: nova/virt/xenapi/network_utils.py:55
 #, python-format
 msgid "Found non-unique network for bridge %s"
-msgstr ""
+msgstr "Nalezena sít mostu %s, která není jedinečná"
 
 #: nova/virt/xenapi/network_utils.py:58
 #, python-format
 msgid "Found no network for bridge %s"
-msgstr ""
+msgstr "Žádná síť pro most %s nenalezena"
 
 #: nova/virt/xenapi/pool.py:111
 #, python-format
@@ -6109,9 +6205,9 @@ msgid "Unable to join %(host)s in the pool"
 msgstr "Nelze najít hostitele pro instanci %s"
 
 #: nova/virt/xenapi/pool.py:162
-#, python-format
+#, fuzzy, python-format
 msgid "Pool-eject failed: %(e)s"
-msgstr ""
+msgstr "Nelze vložit soubor: %(resp)r"
 
 #: nova/virt/xenapi/pool.py:174
 #, fuzzy, python-format
@@ -6126,7 +6222,7 @@ msgstr ""
 #: nova/virt/xenapi/vif.py:103
 #, python-format
 msgid "Found no PIF for device %s"
-msgstr ""
+msgstr "Nenalezeno žádné PIF pro zařízení %s"
 
 #: nova/virt/xenapi/vif.py:122
 #, python-format
@@ -6134,697 +6230,731 @@ msgid ""
 "PIF %(pif_rec['uuid'])s for network %(bridge)s has VLAN id %(pif_vlan)d. "
 "Expected %(vlan_num)d"
 msgstr ""
+"PIF %(pif_rec['uuid'])s pro síť %(bridge)s má id VLAN %(pif_vlan)d. "
+"Očekáváno %(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
+#, fuzzy, python-format
 msgid "Created VM"
-msgstr ""
+msgstr "_vytvořit: %s"
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
-msgstr ""
+msgstr "VBD v instanci %s nenalezeno"
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "skupina %s již existuje"
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
-msgstr ""
+msgstr "Nelze odpojit VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
-msgstr ""
+msgstr "Nelze zničit VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:305
-#, python-format
+#: nova/virt/xenapi/vm_utils.py:306
+#, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-msgstr ""
+msgstr "Vytváření VBD na CD-ROM pro VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
-msgstr ""
+msgstr "Nelze zničit VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
+"Vytvořeno VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
+"%(read_only)s) na %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
-msgstr ""
+msgstr "Zkopírováno VDI %(vdi_ref)s z VDI %(vdi_to_copy_ref)s na %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
-msgstr ""
+msgstr "Zkopírováno VDI %(vdi_ref)s z VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
-msgstr "Nenalezeno žádné cílové id ve svazku %(volume_id)s."
+msgstr "Nenalezeno žádné hlavní VDI pro %(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:382
-#, python-format
+#: nova/virt/xenapi/vm_utils.py:384
+#, fuzzy, python-format
 msgid "Snapshotting with label '%(label)s'"
-msgstr ""
+msgstr "Snímkování VM %(vm_ref)s se štítkem '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:395
-#, python-format
+#: nova/virt/xenapi/vm_utils.py:397
+#, fuzzy, python-format
 msgid "Created snapshot %(template_vm_ref)s"
-msgstr ""
+msgstr "Vytvořen snímek %(template_vm_ref)s z VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
-msgstr ""
+msgstr "Žádání xapi o nahrání %(vdi_uuids)s jako ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
+"Rychlé kopírování je podporováno pouze na výchozím místním SR typu ext. "
+"SR na tomto systému je typu %(sr_type)s. Ignorování příznaku cow."
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
-msgstr ""
+msgstr "Žádání xapi o získání obrazu vhd %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
-msgstr ""
+msgstr "xapi 'download_vhd' vrátil VDI typu '%(vdi_type)s' s UUID '%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
-msgstr ""
+msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
-msgstr ""
+msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
+"Velkost %(size_bytes) obrazu překračuje povolenou velikost "
+"%(allowed_size_bytes)d typu instance"
 
-#: nova/virt/xenapi/vm_utils.py:831
-#, python-format
+#: nova/virt/xenapi/vm_utils.py:833
+#, fuzzy, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
-msgstr ""
+msgstr "Získávání obrazu %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:844
-#, python-format
+#: nova/virt/xenapi/vm_utils.py:846
+#, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
-msgstr ""
+msgstr "Velikost obrazu %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
+"Obraz Kernel/Ramdisk je příliš velký: %(vdi_size)d bajtů, max "
+"%(max_size)d bajtů"
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
-msgstr ""
+msgstr "Kopírování VDI %s do /boot/guest na dom0"
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
-msgstr ""
+msgstr "Kernel/Ramdisk VDI %s zničeno"
 
-#: nova/virt/xenapi/vm_utils.py:896
-#, fuzzy
+#: nova/virt/xenapi/vm_utils.py:897
+#, fuzzy, python-format
 msgid "Failed to fetch glance image"
-msgstr "Nelze restartovat instanci"
+msgstr "instance %s: nelze získat obraz glance"
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
-msgstr ""
+msgstr "Zjištěn formát %(image_type_str)s obrazu %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
-msgstr ""
+msgstr "Hledání vdi %s pro kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
-msgstr ""
+msgstr "Neznámý formát obrazu %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
-msgstr ""
+msgstr "VDI %s je stále dostupné"
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
-msgstr ""
+msgstr "Znovu skenování SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
-msgstr ""
+msgstr "Příznak sr_matching_filter '%s' se neřídí pravidly formátování"
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
+"XenAPI nelze najít úložiště na které nainstalovat instance hostů. Prosím "
+"zkontrolujte Vaše nastavení a/nebo nastavte příznak 'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
-msgstr ""
+msgstr "Nelze najít SR typu obsahu ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
-msgstr ""
+msgstr "ISO: hledání SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
-msgstr ""
+msgstr "ISO: není obsah iso"
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
-msgstr ""
+msgstr "ISO: typ obsahu iso, není klíč 'i18n-key'"
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
-msgstr ""
+msgstr "ISO: typ obsahu iso, hodnota i18n-key není 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
-msgstr ""
+msgstr "ISO: SR odpovídající naším kritériím"
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
-msgstr ""
+msgstr "ISO: ISO, prozkoumáváno, zdali se jedná o místního hostitele"
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
-msgstr ""
+msgstr "ISO: PBD %(pbd_ref)s zmizelo"
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
-msgstr ""
+msgstr "ISO: shoda PBD, požadováno %(pbd_rec)s, získáno %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
-msgstr ""
+msgstr "ISO: SR s místním PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
+"Nelze získat RRD XML pro VM %(vm_uuid)s mající podrobnosti serveru: "
+"%(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
-msgstr ""
+msgstr "Nelze získat aktualizace RRD XML s podrobnostmi serveru: %(server)s."
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
-msgstr ""
+msgstr "Neznámá data statistik od Xenserver: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
-msgstr ""
+msgstr "VHD %(vdi_uuid)s má nadřazenho %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
+"Nadřazený %(parent_uuid)s se neshoduje s původním nadřazeným "
+"%(original_parent_uuid)s, čekání na splynutí..."
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
-msgstr ""
+msgstr "Překročeny pokusy o splynutí VHD (%(max_attempts)d), přerušeno..."
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
+msgstr "Vypršel časový limit při čekání na vytvoření zařízení %s"
+
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
-msgstr ""
+msgstr "Zapojování VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
-msgstr ""
+msgstr "Zapojování VBD %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
-msgstr ""
+msgstr "VBD %(vbd_ref)s zapojeno jako %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
-msgstr ""
+msgstr "VBD %(vbd_ref)s zapojeno do špatného dev, znovu mapování do %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
-msgstr ""
+msgstr "Ničení VBD pro VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
-msgstr ""
+msgstr "Ničení VBD pro VDI %s hotovo."
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
-msgstr ""
+msgstr "Spouštění pygrub s %s"
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
-msgstr ""
+msgstr "Nalezen kernel Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
-msgstr ""
+msgstr "Žádný kernel Xen nenalezen. Zavádění HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
-msgstr ""
+msgstr "Oddíly:"
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
-msgstr ""
+msgstr "  %(num)s: %(ptype)s %(size)d sektorů"
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
+"Zapisování tabulky oddílů %(primary_first)d %(primary_last)d do "
+"%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
-msgstr ""
+msgstr "Zapisování tabulky oddílů %s dokončeno."
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
+"Nástroje XenServer instalované v tomto obrazu jsou schopné vložit sítě. "
+"Síťové soubory nebudou změněny"
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
+"Nástroje XenServer jsou v tomto obrazu přítomny, ale nejsou schopny "
+"vložit síť"
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
-msgstr ""
+msgstr "Nástroje XenServer nejsou v tomto obrazu nainstalovány"
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
-msgstr ""
+msgstr "Přímé zacházení se soubory rozhraní"
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
+msgstr "Nelze připojit souborový systém (očekáváno v nelinuxových instancích): %s"
+
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
-#, python-format
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
+#, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
-msgstr ""
+msgstr "Aktualizace postupu instance '%(instance_uuid)s' na %(progress)d"
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy
 msgid "Starting instance"
 msgstr "Spouštění instance..."
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
-msgstr ""
+msgstr "Odstraňování souborů kernel/ramdisku z dom0"
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
+#, fuzzy, python-format
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
+"Automatické nastavení disku pro instanci %(instance_uuid)s, pokus o změnu"
+" velikosti oddílu..."
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 #, fuzzy
 msgid "Starting VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
-msgstr ""
+msgstr "Psled v agenta pro %(hypervisor)s/%(os)s/%(architecture)s je %(version)s"
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
-msgstr ""
+msgstr "Nenalezena žádná verze agenta pro %(hypervisor)s/%(os)s/%(architecture)s"
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
-msgstr ""
+msgstr "Dotaz na verzi agenta"
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
-msgstr ""
+msgstr "Verze agenta instance: %s"
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
-msgstr ""
+msgstr "Aktualizace agenta na %s"
 
-#: nova/virt/xenapi/vmops.py:552
-#, python-format
+#: nova/virt/xenapi/vmops.py:551
+#, fuzzy, python-format
 msgid "Invalid value for injected_files: %r"
-msgstr ""
+msgstr "Neplatná hodnota pro injected_files: '%s'"
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
-msgstr ""
+msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
-msgstr ""
+msgstr "Nastavování správcovského hesla"
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
-msgstr ""
+msgstr "Reset sítě"
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
-msgstr ""
+msgstr "Nastavování váhy VCPU"
 
-#: nova/virt/xenapi/vmops.py:582
+#: nova/virt/xenapi/vmops.py:581
 #, fuzzy, python-format
-msgid "Could not find VM by name"
-msgstr "Nelze najít %s v požadavku."
+msgid "Could not find VM with name %s"
+msgstr "Nelze najít nastavení v %(path)s"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
+#, fuzzy, python-format
 msgid "Finished snapshot and upload for VM"
-msgstr ""
+msgstr "Dokončen snímek a nahrání na VM %s"
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 #, fuzzy, python-format
 msgid "Starting snapshot for VM"
-msgstr "Vytvořit snímek ze svazku %s"
+msgstr "Spouštění snímku ve VM %s"
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
-msgstr "Nelze najít hostitele pro instanci %s"
+msgstr "Nelze získat snímek instance %(instance_uuid)s: %(exc)s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
-msgstr ""
+msgstr "Nelze převést vhd na nového hostitele"
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr ""
+msgstr "Zmenšení velikosti VDI %(cow_uuid)s z %(old_gb)d GB na %(new_gb)d GB"
 
 #: nova/virt/xenapi/vmops.py:857
 #, python-format
 msgid "Resizing up VDI %(vdi_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
-msgstr ""
+msgstr "Zvětšení velikosti VDI %(vdi_uuid)s z%(old_gb)d GB na %(new_gb)d GB"
 
 #: nova/virt/xenapi/vmops.py:865
+#, fuzzy, python-format
 msgid "Resize complete"
-msgstr ""
+msgstr "Změna velikosti %s je hotova"
 
 #: nova/virt/xenapi/vmops.py:892
 #, python-format
 msgid "Failed to query agent version: %(resp)r"
-msgstr ""
+msgstr "Nelze se dotázat na verzi agenta: %(resp)r"
 
 #: nova/virt/xenapi/vmops.py:913
-#, python-format
+#, fuzzy, python-format
 msgid "domid changed from %(domid)s to %(newdomid)s"
-msgstr ""
+msgstr "domid změněno z %(olddomid)s na %(newdomid)s"
 
 #: nova/virt/xenapi/vmops.py:926
 #, python-format
 msgid "Failed to update agent: %(resp)r"
-msgstr ""
+msgstr "Nelze aktualizovat agenta: %(resp)r"
 
 #: nova/virt/xenapi/vmops.py:947
 #, python-format
 msgid "Failed to exchange keys: %(resp)r"
-msgstr ""
+msgstr "Nelze vyměnit klíče: %(resp)r"
 
 #: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update password: %(resp)r"
-msgstr ""
+msgstr "Nelze aktualizovat heslo: %(resp)r"
 
 #: nova/virt/xenapi/vmops.py:987
 #, python-format
 msgid "Failed to inject file: %(resp)r"
-msgstr ""
+msgstr "Nelze vložit soubor: %(resp)r"
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
+#, fuzzy, python-format
 msgid "VM already halted, skipping shutdown..."
-msgstr ""
+msgstr "VM %(instance_uuid)s již je zastavena, přeskakování vypnutí..."
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
-msgstr ""
+msgstr "Nelze najít VBD pro VM"
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
+#, fuzzy, python-format
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
+"Instance %(instance_uuid)s pomocí RAW nebo VHD, přeskakování mazání "
+"kernelu a ramdisku"
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
-msgstr ""
+msgstr "Instance mí kernel nebo ramdisk, ale ne oba"
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
-msgstr ""
+msgstr "soubory kernel/ramdisk odstraněny"
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
-msgstr ""
+msgstr "VM není přítomno, přeskakování ničení..."
 
 #: nova/virt/xenapi/vmops.py:1188
 #, python-format
 msgid "Instance is already in Rescue Mode: %s"
-msgstr ""
+msgstr "Instance již je v záchranném režimu: %s"
 
 #: nova/virt/xenapi/vmops.py:1262
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
+"Nalezeno %(instance_count)d zaseknutých restartování starších než "
+"%(timeout)d vteřin"
 
 #: nova/virt/xenapi/vmops.py:1266
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
-#, python-format
+#: nova/virt/xenapi/vmops.py:1338
+#, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
-msgstr ""
+msgstr "Vypínání VM pro instanci %(instance_uuid)s"
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Instance %(instance_id)s nenalezena"
 
-#: nova/virt/xenapi/vmops.py:1349
-#, fuzzy, python-format
+#: nova/virt/xenapi/vmops.py:1347
+#, fuzzy
 msgid "In ERROR state"
-msgstr "Chyba DB: %s"
+msgstr "Uzel je v neznámém chybovém stavu."
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
+#, fuzzy
 msgid "Creating vifs"
-msgstr ""
+msgstr "Vytváření obrazu"
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6857,7 +6987,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6870,11 +7000,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6942,101 +7072,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7172,117 +7302,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: pořizování snímku"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7305,150 +7435,150 @@ msgstr "Připojeno k serveru AMQP na %s"
 #: nova/volume/netapp.py:159
 #, fuzzy, python-format
 msgid "Job failed: %s"
-msgstr "Vyvoláno Nenalezeno: %s"
+msgstr "Neznámý základní soubor: %s"
 
 #: nova/volume/netapp.py:240
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "Nelze najít hostitele pro instanci %s"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "Žádná data vpn pro projekt %s"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, fuzzy, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr "Nelze získat metadata pro ip: %s"
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, fuzzy, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr "Nelze získat metadata pro ip: %s"
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, fuzzy, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr "Nelze získat metadata pro ip: %s"
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, fuzzy, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Nelze získat metadata pro ip: %s"
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
 msgstr "Smazat svazek s id: %s"
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7502,36 +7632,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7541,9 +7671,9 @@ msgid "Nexenta SA returned the error"
 msgstr "Server vrátil chybu: %s"
 
 #: nova/volume/nexenta/jsonrpc.py:64
-#, python-format
+#, fuzzy, python-format
 msgid "Sending JSON data: %s"
-msgstr ""
+msgstr "Zadaná data: %s"
 
 #: nova/volume/nexenta/jsonrpc.py:69
 #, python-format
@@ -7614,6 +7744,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr "Služba svazku je v tuto chvíli nedostupná."
+
 #~ msgid "Nova access parameters were not specified."
 #~ msgstr "Přístupové parametry Nova nebyly zadány."
 
@@ -7623,6 +7756,12 @@ msgstr ""
 #~ msgid "Virtual Storage Array %(name)s could not be found."
 #~ msgstr "Pole virtuálního úložiště %(name)s nebylo nalezeno."
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "Vnitřní výjimka: %s"
+
+#~ msgid "Original exception being dropped"
+#~ msgstr "Původní výjimka je zahozena"
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr "Zastavování prostého serveru TCP."
 
@@ -7635,6 +7774,27 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr "Navrácen neserializovatelný typ: %s"
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr "%(user_id)s nelze nalézt se známkou '%(token)s'"
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr "%(user_id)s musí být správcem nebo členem %(project_id)s"
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr "Požadavky o ověření musí být prováděny proti verzi kořenu (např. /v2)."
+
+#~ msgid "Could not find %s in request."
+#~ msgstr "Nelze najít %s v požadavku."
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr "'%s' úspěšně ověřeno"
+
+#~ msgid "User not found with provided API key."
+#~ msgstr "Uživatel nenalezen pomocí zadaného klíče API."
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr "Zadaný klíč API je platný, ale ne pro uživatele '%(username)s'"
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr "Přidružení plovoucí ip selhalo"
 
@@ -7689,6 +7849,12 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr "Indexovat instance pro VSA %s"
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+#~ "Překročena kvóta pro %(pid)s, hodnota "
+#~ "nebo klíč vlastnosti metadat je příliš"
+#~ " dlouhý"
+
 #~ msgid "Creating a raw instance"
 #~ msgstr "Vytváření prosté instance"
 
@@ -7711,15 +7877,87 @@ msgstr ""
 #~ " ale bude přesto vypnuta pomocí "
 #~ "speciálního kontextu"
 
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr "vyjímka ukončující tuto instanci %(instance_uuid)s"
+
 #~ msgid "Instance %s not found."
 #~ msgstr "Instance %s nenalezena."
 
 #~ msgid "trying to destroy already destroyed instance: %s"
 #~ msgstr "pokus o zničení již zničené instance: %s"
 
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr "instance %(instance_uuid)s: vsunutí souboru do %(path)s"
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr "instance %(instance_uuid)s: aktualizace agenta na %(url)s"
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr "instance %s: zachraňování"
+
+#~ msgid "instance %s: migrating"
+#~ msgstr "instance %s: přesunování"
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "instance %s: pozastavování"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "instance %s: rušení pozastavení"
+
+#~ msgid "instance %s: resuming"
+#~ msgstr "instance %s: pokračování"
+
+#~ msgid "instance %s: locking"
+#~ msgstr "instance %s: uzamykání"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "instance %s: odemykání"
+
+#~ msgid "instance %s: reset network"
+#~ msgstr "instance %s: reset sítě"
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr "Připojení selhalo %(mountpoint)s, odstraňování"
+
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr "python-migrate není nainstalován. Ukončování."
+
+#~ msgid "interface column not added to networks table"
+#~ msgstr "Slouppec interface nepřidáno do tabulky networks"
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr "Sloupec VIF nepřidán do tabulky fixed_ips"
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr "přidat seznam pro pohybující se mac adresy |%s|"
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr "Nelze degradovat bez ztrátu dat"
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr "omezení cizího klíče nemohlo být přidáno"
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr "sloupec priority nepřidán do tabulky networks"
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr "sloupec progress nepřidán do tabulky interfaces"
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+#~ "Nelze obsadit id konfigurace do celého"
+#~ " čísla %s. Nastavte id do řetězce "
+#~ "podobném celému číslu pro degradaci."
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr "Sloupec progress nepřidán do tabulky compute_nodes"
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr "tabulka dns_domains nesmazána"
+
 #~ msgid "Sending notification on %s..."
 #~ msgstr "Odesílání oznámení do %s..."
 
@@ -7770,353 +8008,256 @@ msgstr ""
 #~ " na stejném sdíleném úložišti mezi "
 #~ "%(src)s a %(dest)s."
 
-#~ msgid "Driver Method %(driver_method)s missing: %(e)s.Reverting to schedule()"
-#~ msgstr ""
-
-#~ msgid "Setting instance %(instance_uuid)s to ERROR state."
-#~ msgstr ""
-
 #~ msgid "_filter_hosts: %(request_spec)s"
-#~ msgstr ""
+#~ msgstr "_filter_hosts: %(request_spec)s"
 
 #~ msgid "Filter hosts for drive type %s"
-#~ msgstr ""
+#~ msgstr "Filtrovat hostitele podle typu jednotky %s"
 
 #~ msgid "Host %s has no free capacity. Skip"
-#~ msgstr ""
+#~ msgstr "Hostitel %s nemá žádnou volnou kapacitu. Přeskakování"
 
 #~ msgid "Filter hosts: %s"
-#~ msgstr ""
+#~ msgstr "Filtrovat hostitele %s"
 
 #~ msgid "Must implement host selection mechanism"
-#~ msgstr ""
-
-#~ msgid "Maximum number of hosts selected (%d)"
-#~ msgstr ""
+#~ msgstr "Musí být zaveden mechanismus výběru hostitele"
 
 #~ msgid "Selected excessive host %(host)s"
-#~ msgstr ""
+#~ msgstr "Vybrán nadměrný hostitel %(host)s"
 
 #~ msgid "Provision volume %(name)s of size %(size)s GB on host %(host)s"
 #~ msgstr ""
+#~ "Ustanovující svazek %(name)s o velikost "
+#~ "%(size)s GB  na hostiteli %(host)s"
 
 #~ msgid "volume_params %(volume_params)s"
-#~ msgstr ""
+#~ msgstr "parametry svazku %(volume_params)s"
 
 #~ msgid "%(i)d: Volume %(name)s"
-#~ msgstr ""
+#~ msgstr "%(i)d: Svazek %(name)s"
 
 #~ msgid "Attempting to spawn %(num_volumes)d volume(s)"
-#~ msgstr ""
+#~ msgstr "Pokus o vytvoření %(num_volumes)d svazků"
 
 #~ msgid "Error creating volumes"
-#~ msgstr ""
+#~ msgstr "Chyba při vytváření svazků"
 
 #~ msgid "Non-VSA volume %d"
-#~ msgstr ""
+#~ msgstr "Ne VSA svazek %d"
 
 #~ msgid "Spawning volume %(volume_id)s with drive type %(drive_type)s"
-#~ msgstr ""
+#~ msgstr "Vytváření svazku %(volume_id)s s typem jednotky %(drive_type)s"
 
 #~ msgid "Error creating volume"
-#~ msgstr ""
+#~ msgstr "Chyba při vytváření svazku"
 
 #~ msgid "No capability selected for volume of size %(size)s"
-#~ msgstr ""
+#~ msgstr "Nezvolena žádná schopnost pro svazek o velikosti %(size)s"
 
 #~ msgid "Host %s:"
-#~ msgstr ""
+#~ msgstr "Hostitel %s:"
 
 #~ msgid ""
 #~ "\tDrive %(qosgrp)-25s: total %(total)2s, "
 #~ "used %(used)2s, free %(free)2s. Available "
 #~ "capacity %(avail)-5s"
 #~ msgstr ""
+#~ "\tJednotka %(qosgrp)-25s: celkem %(total)2s,"
+#~ " použito %(used)2s, volné %(free)2s. "
+#~ "Dostupná kapacita %(avail)-5s"
 
 #~ msgid ""
 #~ "\t LeastUsedHost: Best host: %(best_host)s."
 #~ " (used capacity %(min_used)s)"
 #~ msgstr ""
+#~ "\t Nejméně používaný hostitel: Nejlepší "
+#~ "hostitel: %(best_host)s. (použitá kapacita "
+#~ "%(min_used)s)"
 
 #~ msgid ""
 #~ "\t MostAvailCap: Best host: %(best_host)s. "
 #~ "(available %(max_avail)s %(type_str)s)"
 #~ msgstr ""
+#~ "\t Nejdostupnější kapacita: Nejlepší hostitel:"
+#~ " %(best_host)s.  (dostupné%(max_avail)s %(type_str)s)"
 
 #~ msgid "(%(nm)s) publish (key: %(routing_key)s) %(message)s"
-#~ msgstr ""
+#~ msgstr "(%(nm)s) publikování (key: %(routing_key)s) %(message)s"
 
 #~ msgid "Publishing to route %s"
-#~ msgstr ""
+#~ msgstr "Publikování na cestu %s"
 
 #~ msgid "Declaring queue %s"
-#~ msgstr ""
+#~ msgstr "Určení fronty %s"
 
 #~ msgid "Declaring exchange %s"
-#~ msgstr ""
+#~ msgstr "Určení výměny %s"
 
 #~ msgid "Binding %(queue)s to %(exchange)s with key %(routing_key)s"
-#~ msgstr ""
+#~ msgstr "Svazování %(queue)s do %(exchange)s s klíčem %(routing_key)s"
 
 #~ msgid "Getting from %(queue)s: %(message)s"
-#~ msgstr ""
+#~ msgstr "Získávání z %(queue)s: %(message)s"
 
 #~ msgid "Test: Emulate wrong VSA name. Raise"
-#~ msgstr ""
+#~ msgstr "Zkouška: Emulace špatného názvu VSA. Vyvolání"
 
 #~ msgid "Test: Emulate DB error. Raise"
-#~ msgstr ""
+#~ msgstr "Zkouška: Emulace chyby DB. Vyvolání"
 
 #~ msgid "Test: user_data = %s"
-#~ msgstr ""
+#~ msgstr "Zkouška: user_data = %s"
 
 #~ msgid "_create: param=%s"
-#~ msgstr ""
+#~ msgstr "_vytvořit: param=%s"
 
 #~ msgid "Host %s"
-#~ msgstr ""
+#~ msgstr "Hostitel %s"
 
 #~ msgid "Test: provision vol %(name)s on host %(host)s"
-#~ msgstr ""
+#~ msgstr "Test: poskytnutí svazku %(name)s na hostiteli %(host)s"
 
 #~ msgid "\t vol=%(vol)s"
-#~ msgstr ""
+#~ msgstr "\t vol=%(vol)s"
 
 #~ msgid "Test: VSA update request: vsa_id=%(vsa_id)s values=%(values)s"
-#~ msgstr ""
+#~ msgstr "Test: požadavek aktualizace VSA: vsa_id=%(vsa_id)s hodnoty=%(values)s"
 
 #~ msgid "Test: Volume create: %s"
-#~ msgstr ""
+#~ msgstr "Test: Vytvoření svazku: %s"
 
 #~ msgid "Test: Volume get request: id=%(volume_id)s"
-#~ msgstr ""
+#~ msgstr "Test: Požadavek získání svazku: id=%(volume_id)s"
 
 #~ msgid "Test: Volume update request: id=%(volume_id)s values=%(values)s"
-#~ msgstr ""
+#~ msgstr "Test: Požadavek aktualizace svazku: id=%(volume_id)s hodnoty=%(values)s"
 
 #~ msgid "Test: Volume get: id=%(volume_id)s"
-#~ msgstr ""
+#~ msgstr "Test: Získání svazku: id=%(volume_id)s"
+
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr "Pokus o odfiltrování instance %s, která není filtrována"
 
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
-#~ msgstr ""
+#~ msgstr "Úkol [%(name)s] %(task)s stav: úspěch %(result)s"
 
 #~ msgid "Task [%(name)s] %(task)s status: %(status)s    %(error_info)s"
-#~ msgstr ""
-
-#~ msgid "Unable to get updated status: %s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "deactivate_node is called for                "
-#~ "node_id = %(id)s node_ip = %(ip)s"
-#~ msgstr ""
+#~ msgstr "Úkol [%(name)s] %(task)s stav: %(status)s %(error_info)s"
 
 #~ msgid "virsh said: %r"
-#~ msgstr ""
+#~ msgstr "virsh oznámil: %r"
 
 #~ msgid "cool, it's a device"
-#~ msgstr ""
+#~ msgstr "super, je to zařízení"
 
 #~ msgid "Unable to read LXC console"
-#~ msgstr ""
+#~ msgstr "Nelze přečíst konzoli LXC"
 
 #~ msgid ""
 #~ "to xml...\n"
 #~ ":%s "
 #~ msgstr ""
-
-#~ msgid "During wait running, %s disappeared."
-#~ msgstr ""
-
-#~ msgid "Instance %s running successfully."
-#~ msgstr ""
+#~ "do xml...\n"
+#~ ":%s "
 
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
-#~ msgstr ""
-
-#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image verification failed"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "%(container_format)s-%(id)s (%(base_file)s): image "
-#~ "verification skipped, no hash stored"
-#~ msgstr ""
-
-#~ msgid "%(container_format)s-%(id)s (%(base_file)s): checking"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "%(container_format)s-%(id)s (%(base_file)s): in use:"
-#~ " on this node %(local)d local, "
-#~ "%(remote)d on other nodes"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "%(container_format)s-%(id)s (%(base_file)s): warning "
-#~ "-- an absent base file is in "
-#~ "use! instances: %(instance_list)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "%(container_format)s-%(id)s (%(base_file)s): in: on"
-#~ " other nodes (%(remote)d on other "
-#~ "nodes)"
-#~ msgstr ""
-
-#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is not in use"
-#~ msgstr ""
-
-#~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
-#~ msgstr ""
+#~ msgstr "Nwfilter (%(instance_secgroup_filter_name)s) nenalezen."
 
 #~ msgid "Created VM %s..."
-#~ msgstr ""
+#~ msgstr "Vytvořeno VM %s..."
 
 #~ msgid "Created VM %(instance_name)s as %(vm_ref)s."
-#~ msgstr ""
-
-#~ msgid "Creating a CDROM-specific VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
-#~ msgstr ""
+#~ msgstr "Vytvořeno VM %(instance_name)s jako %(vm_ref)s."
 
 #~ msgid ""
 #~ "Created a CDROM-specific VBD %(vbd_ref)s"
 #~ "  for VM %(vm_ref)s, VDI %(vdi_ref)s."
-#~ msgstr ""
-
-#~ msgid "No primary VDI found for%(vm_ref)s"
-#~ msgstr ""
-
-#~ msgid "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
-#~ msgstr ""
-
-#~ msgid "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
-#~ msgstr ""
-
-#~ msgid "Fetching image %(image)s"
-#~ msgstr ""
+#~ msgstr "Vytvořeno VBD %(vbd_ref)s na CD-ROM pro VM %(vm_ref)s, VDI %(vdi_ref)s."
 
 #~ msgid "Image Type: %s"
-#~ msgstr ""
+#~ msgstr "Typ obrazu: %s"
 
 #~ msgid "ISO: Found sr possibly containing the ISO image"
-#~ msgstr ""
+#~ msgstr "ISO: Nalezen sr pravděpodobně obsahující obraz ISO"
 
-#~ msgid "Size for image %(image)s:%(virtual_size)d"
-#~ msgstr ""
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr "(VM_UTILS) xenserver stav vm  -> |%s|"
 
-#~ msgid "instance %s: Failed to fetch glance image"
-#~ msgstr ""
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr "(VM_UTILS) xenapi stav napájení -> |%s|"
 
 #~ msgid "Creating VBD for VDI %s ... "
-#~ msgstr ""
+#~ msgstr "Vytváření VBD pro VDI %s ... "
 
 #~ msgid "Creating VBD for VDI %s done."
-#~ msgstr ""
+#~ msgstr "Vytváření VBD pro VDI %s hotovo."
 
 #~ msgid "VBD.unplug successful first time."
-#~ msgstr ""
+#~ msgstr "Odpojení VBD úspěšné poprvé."
 
 #~ msgid "VBD.unplug rejected: retrying..."
-#~ msgstr ""
+#~ msgstr "Odpojení VBD neúspěšné: novv pokus..."
 
 #~ msgid "Not sleeping anymore!"
-#~ msgstr ""
+#~ msgstr "JIž se nespí!"
 
 #~ msgid "VBD.unplug successful eventually."
-#~ msgstr ""
+#~ msgstr "Odpojení VBD nakonec úspěšné."
 
 #~ msgid "Ignoring XenAPI.Failure in VBD.unplug: %s"
-#~ msgstr ""
+#~ msgstr "Ignorování selhání XenAPI v odpojení VBD: %s"
 
 #~ msgid "Ignoring XenAPI.Failure %s"
-#~ msgstr ""
+#~ msgstr "Ignorování selhání XenAPI %s"
 
 #~ msgid "Attempted to power on non-existent instance bad instance id %s"
-#~ msgstr ""
+#~ msgstr "Pokus o zapnutí neexistující instance, špatné id instance %s"
 
 #~ msgid "Starting instance %s"
-#~ msgstr ""
+#~ msgstr "Spouštění instance %s"
 
 #~ msgid "instance %s: Failed to spawn"
-#~ msgstr ""
+#~ msgstr "instance %s: Nelze spustit"
 
 #~ msgid "Instance %s failed to spawn - performing clean-up"
-#~ msgstr ""
+#~ msgstr "Instanci %s nelze spustit - provádění vyčištění"
 
 #~ msgid "instance %s: Failed to spawn - Unable to create VM"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Auto configuring disk for instance "
-#~ "%(instance_uuid)s, attempting to resize "
-#~ "partition..."
-#~ msgstr ""
-
-#~ msgid "Invalid value for injected_files: '%s'"
-#~ msgstr ""
+#~ msgstr "instance %s: Nelze spustit - Nelze vytvořit VM"
 
 #~ msgid "Starting VM %s..."
-#~ msgstr ""
+#~ msgstr "Zavádění VM %s..."
 
 #~ msgid "Spawning VM %(instance_uuid)s created %(vm_ref)s."
-#~ msgstr ""
+#~ msgstr "Spouštění VM %(instance_uuid)s vytvořeno %(vm_ref)s."
 
 #~ msgid "Instance %s: waiting for running"
-#~ msgstr ""
+#~ msgstr "Instance %s: čekání na spuštění"
 
 #~ msgid "Instance %s: running"
-#~ msgstr ""
+#~ msgstr "Instance %s: spuštěna"
 
 #~ msgid "Resources to remove:%s"
-#~ msgstr ""
+#~ msgstr "Zdroje k odstranění: %s"
 
 #~ msgid "Removing VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
-#~ msgstr ""
+#~ msgstr "Odstraňování VDI %(vdi_ref)s(uuid:%(vdi_to_remove)s)"
 
 #~ msgid "Skipping VDI destroy for %s"
-#~ msgstr ""
+#~ msgstr "Přeskakování ničení VDI pro %s"
 
 #~ msgid "No opaque_ref could be determined for '%s'."
-#~ msgstr ""
-
-#~ msgid "Finished snapshot and upload for VM %s"
-#~ msgstr ""
-
-#~ msgid "Starting snapshot for VM %s"
-#~ msgstr ""
-
-#~ msgid "Unable to Snapshot instance %(instance_uuid)s: %(exc)s"
-#~ msgstr ""
-
-#~ msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
-#~ msgstr ""
-
-#~ msgid "Resize instance %s complete"
-#~ msgstr ""
-
-#~ msgid "domid changed from %(olddomid)s to %(newdomid)s"
-#~ msgstr ""
-
-#~ msgid "VM %(instance_uuid)s already halted,skipping shutdown..."
-#~ msgstr ""
-
-#~ msgid "Shutting down VM for Instance %(instance_uuid)s"
-#~ msgstr ""
+#~ msgstr "Pro '%s' nemohla být zjištěna opaque_ref."
 
 #~ msgid "Destroying VDIs for Instance %(instance_uuid)s"
-#~ msgstr ""
-
-#~ msgid ""
-#~ "Instance %(instance_uuid)s using RAW or "
-#~ "VHD, skipping kernel and ramdisk "
-#~ "deletion"
-#~ msgstr ""
+#~ msgstr "Ničení VDI pro instanci %(instance_uuid)s"
 
 #~ msgid "Instance %(instance_uuid)s VM destroyed"
-#~ msgstr ""
+#~ msgstr "VM instance %(instance_uuid)s zničeno"
 
 #~ msgid "Destroying VM for Instance %(instance_uuid)s"
-#~ msgstr ""
+#~ msgstr "Ničení VM instance %(instance_uuid)s"
 
 #~ msgid "Automatically hard rebooting %d"
 #~ msgstr ""
@@ -8210,6 +8351,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index 7cb8c43e4..21cc4a063 100644
--- a/nova/locale/da/LC_MESSAGES/nova.po
+++ b/nova/locale/da/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2011-01-15 21:46+0000\n"
 "Last-Translator: Soren Hansen <soren@linux2go.dk>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr ""
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -80,257 +80,262 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -338,745 +343,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1100,364 +1142,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr ""
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1466,240 +1509,245 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1740,39 +1788,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1803,31 +1818,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1836,57 +1863,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1981,31 +2008,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2030,216 +2069,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2315,7 +2341,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2408,32 +2433,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2462,23 +2488,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2530,114 +2556,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2649,261 +2682,272 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2922,493 +2966,467 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1764
 #, python-format
-msgid "Attach failed %(mountpoint)s, removing"
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3453,17 +3471,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3472,37 +3490,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3510,104 +3528,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3666,117 +3643,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3784,115 +3766,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3932,54 +3914,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4031,89 +4013,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4141,41 +4123,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4188,59 +4170,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4305,21 +4287,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4364,29 +4346,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4434,12 +4416,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4454,19 +4436,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4489,32 +4470,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4573,21 +4554,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4596,26 +4577,24 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4627,7 +4606,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4652,27 +4631,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4800,99 +4779,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4944,32 +4923,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4988,11 +4967,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5015,183 +5000,183 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "bind %s: slettet"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5201,42 +5186,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5267,151 +5249,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, python-format
+msgid "Read: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "Writing image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5443,32 +5445,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5550,23 +5552,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5580,225 +5580,199 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5808,76 +5782,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5967,512 +5955,512 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6516,39 +6504,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6566,88 +6554,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6680,7 +6668,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6693,11 +6681,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6765,101 +6753,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -6994,117 +6982,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "bind %s: slettet"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7132,144 +7120,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, python-format
 msgid "No LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, python-format
 msgid "Deleting volumeID: %s"
 msgstr ""
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7323,36 +7311,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7433,6 +7421,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7454,6 +7445,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7470,6 +7464,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7482,12 +7479,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7536,6 +7560,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7629,6 +7656,73 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: retrieving diagnostics"
+#~ msgstr ""
+
+#~ msgid "instance %s: suspending"
+#~ msgstr ""
+
+#~ msgid "instance %s: resuming"
+#~ msgstr ""
+
+#~ msgid "instance %s: locking"
+#~ msgstr ""
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting locked state"
+#~ msgstr ""
+
+#~ msgid "instance %s: reset network"
+#~ msgstr ""
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid "Detaching volume from unknown instance %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7646,15 +7740,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7848,6 +7989,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7862,6 +8009,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7876,12 +8026,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7920,6 +8079,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr ""
 
@@ -7958,6 +8216,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8161,6 +8425,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index 8b7ea6294..d6d5ac2d2 100644
--- a/nova/locale/de/LC_MESSAGES/nova.po
+++ b/nova/locale/de/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2011-08-23 11:23+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: German <de@li.org>\n"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Unerwarteter Fehler bei Ausführung des Kommandos."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -85,257 +85,262 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,745 +348,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1105,364 +1147,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "Das Service-Datenbank-Objekt ist verschwunden, es wird erneut erzeugt."
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "Alle vorhandenen FLAGS:"
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr ""
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "Hole %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Führe Kommando (subprocess) aus: %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "Ergebnis war %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1471,240 +1514,245 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1745,39 +1793,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1808,31 +1823,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1841,57 +1868,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1986,31 +2013,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2035,216 +2074,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2320,7 +2346,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2413,32 +2438,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2467,23 +2493,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2535,114 +2561,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2654,261 +2687,272 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Verwende Project-Name = User-Name (%s)"
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2927,494 +2971,469 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "Instanz %s pausiert"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "Instanz wurde bereits erstellt"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
-msgstr "Instanz %s: Rettung"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
+msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "Instanz %s pausiert"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
+msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "Instanz %s wird fortgesetzt"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1764
 #, python-format
-msgid "Attach failed %(mountpoint)s, removing"
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
-msgstr ""
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
+msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3459,17 +3478,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3478,37 +3497,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3516,104 +3535,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
-msgstr ""
-
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3672,117 +3650,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3790,115 +3773,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3938,54 +3921,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4037,89 +4020,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID ist %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4147,41 +4130,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4194,59 +4177,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4311,21 +4294,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4370,29 +4353,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4440,12 +4423,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4460,19 +4443,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4495,32 +4477,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4579,21 +4561,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4602,26 +4584,24 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr "Konnte Verbindung zum Hypervisor nicht öffnen"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4633,7 +4613,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4658,27 +4638,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4806,99 +4786,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4950,32 +4930,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4994,11 +4974,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5021,183 +5007,183 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5207,42 +5193,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5273,151 +5256,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, python-format
+msgid "Read: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "Writing image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5449,32 +5452,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5556,23 +5559,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5586,225 +5587,200 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
+msgstr "Instanz %s: Rettung"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5814,76 +5790,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5973,512 +5963,512 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6522,39 +6512,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6572,88 +6562,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6686,7 +6676,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6699,11 +6689,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6771,101 +6761,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7000,117 +6990,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "Volume %s: wird erstellt"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "Volume %s: erstelle Export"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr "Volume %s: entferne Export"
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "Volume %s: wird entfernt"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "Volume %s: erfolgreich entfernt"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7138,144 +7128,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, python-format
 msgid "Deleting volumeID: %s"
 msgstr ""
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7329,36 +7319,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7439,6 +7429,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7460,6 +7453,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7476,6 +7472,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7488,12 +7487,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7542,6 +7568,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7635,6 +7664,67 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "Instanz %s wird fortgesetzt"
+
+#~ msgid "instance %s: retrieving diagnostics"
+#~ msgstr ""
+
+#~ msgid "instance %s: suspending"
+#~ msgstr ""
+
+#~ msgid "instance %s: resuming"
+#~ msgstr ""
+
+#~ msgid "instance %s: locking"
+#~ msgstr ""
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting locked state"
+#~ msgstr ""
+
+#~ msgid "instance %s: reset network"
+#~ msgstr ""
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid "Detaching volume from unknown instance %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7652,15 +7742,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7854,6 +7991,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7868,6 +8011,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7882,12 +8028,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7926,6 +8081,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr ""
 
@@ -7964,6 +8218,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8167,6 +8427,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index 5cc49fd9b..e58310240 100644
--- a/nova/locale/en_AU/LC_MESSAGES/nova.po
+++ b/nova/locale/en_AU/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2011-10-21 11:27+0000\n"
 "Last-Translator: Tom Fifield <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -66,11 +66,11 @@ msgstr "Subject for certificate for projects, %s for project, timestamp"
 msgid "Flags path: %s"
 msgstr "Flags path: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Unexpected error while running command."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -85,258 +85,263 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "no method for message: %s"
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -344,745 +349,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "User %(uid)s is already a member of the group %(group_dn)s"
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1106,250 +1148,251 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "Starting %(topic)s node (version %(vcs_string)s)"
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr "Service killed that has no database entry"
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "The service database object disappeared, Recreating it."
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr "Recovered model server connection!"
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr "model server went away"
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "Inner Exception: %s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr "You must implement __call__"
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr "Too many failed authentications."
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1358,114 +1401,114 @@ msgstr ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Authentication Failure: %s"
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "Authenticated Request For %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "Unauthorised request for controller=%(controller)s and action=%(action)s"
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound raised: %s"
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Unexpected error raised: %s"
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "An unknown error has occurred. Please try your request again."
 
@@ -1474,241 +1517,246 @@ msgstr "An unknown error has occurred. Please try your request again."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Unsupported API request: controller = %(controller)s, action = %(action)s"
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Not enough parameters to build a valid rule."
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorise security group ingress %s"
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "This rule already exists in group %s"
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr "group %s already exists"
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute not supported: %s"
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr "Allocate address"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr "Release address %s"
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1749,39 +1797,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1812,31 +1827,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1845,57 +1872,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1990,31 +2017,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, fuzzy, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr "Invalid signature for user %s"
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2039,216 +2078,204 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+#, fuzzy, python-format
+msgid "HostId cannot be updated."
+msgstr "Mountpoint cannot be translated: %s"
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2324,7 +2351,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2417,32 +2443,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2471,23 +2498,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2539,115 +2566,124 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 #, fuzzy, python-format
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr "Not enough parameters to build a valid rule."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr "This rule already exists in group %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#, fuzzy, python-format
+msgid "start instance"
+msgstr "Reboot instance %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+#, fuzzy, python-format
+msgid "stop instance"
+msgstr "Reboot instance %r"
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "instance %s: booted"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr "Attempted to instantiate singleton"
@@ -2661,27 +2697,27 @@ msgstr ""
 "Attempted to remove the last member of a group. Deleting the group at %s "
 "instead."
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Looking up user: %r"
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Failed authorisation for access key %s"
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Using project name = user name (%s)"
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr "failed authorisation: no project named %(pjid)s (user=%(uname)s)"
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
@@ -2690,240 +2726,251 @@ msgstr ""
 "Failed authorisation: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Invalid signature for user %s"
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr "Must specify project"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "Adding role %(role)s to user %(uid)s in project %(pid)s"
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr "Adding sitewide role %(role)s to user %(uid)s"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr "Removing role %(role)s from user %(uid)s on project %(pid)s"
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr "Removing sitewide role %(role)s from user %(uid)s"
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "Created project %(name)s with manager %(manager_user)s"
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr "modifying project %s"
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Adding user %(uid)s to project %(pid)s"
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Remove user %(uid)s from project %(pid)s"
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr "Deleting project %s"
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "Created user %(rvname)s (admin: %(rvadmin)r)"
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr "Deleting user %s"
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "Access Key change for user %s"
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "Secret Key change for user %s"
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "Admin status set to %(admin)r for user %(uid)s"
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "No vpn data for project %s"
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
 msgstr "Get console output for instance %s"
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr "Network to push into openvpn config"
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr "Netmask to push into openvpn config"
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Launching VPN for %s"
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 #, fuzzy, python-format
 msgid "Cannot run any more instances of this type."
 msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2942,496 +2989,479 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executing: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executing |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "Instance has already been created"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Running instances: %s"
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
-#, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
-msgstr ""
+#: nova/compute/manager.py:1110
+#, fuzzy, python-format
+msgid "injecting file to %(path)s"
+msgstr "Injecting file path: '%s'"
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
-msgstr "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
+msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+#, fuzzy, python-format
+msgid "Unrescuing"
 msgstr "instance %s: unrescuing"
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
+msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "instance %s: suspending"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+#, fuzzy, python-format
+msgid "Getting locked state"
 msgstr "instance %s: getting locked state"
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
-msgstr "instance %s: reset network"
+#: nova/compute/manager.py:1647
+#, fuzzy
+msgid "Reset network"
+msgstr "setting network host"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
-msgstr ""
+#: nova/compute/manager.py:1655
+#, fuzzy
+msgid "Inject network info"
+msgstr "setting network host"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
-msgstr ""
+#: nova/compute/manager.py:1672
+#, fuzzy, python-format
+msgid "Get console output"
+msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
-msgstr ""
+#: nova/compute/manager.py:1699
+#, fuzzy
+msgid "Getting vnc console"
+msgstr "Adding console"
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr ""
+#: nova/compute/manager.py:1764
+#, fuzzy, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr "Adding console"
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr "Tried to remove non-existent console %(console_id)s."
@@ -3476,17 +3506,17 @@ msgstr "Restarting xvp"
 msgid "xvp not running..."
 msgstr "xvp not running..."
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3495,142 +3525,101 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr "Use of empty request context is deprecated"
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
-msgstr "python-migrate is not installed. Exiting."
-
-#: nova/db/sqlalchemy/migration.py:78
+#: nova/db/sqlalchemy/migration.py:74
 msgid "version should be an integer"
 msgstr ""
 
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
 #: nova/db/sqlalchemy/session.py:137
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3689,117 +3678,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Starting VLAN inteface %s"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, fuzzy, python-format
+msgid "Failed to add interface: %s"
+msgstr "Failed to decrypt private key: %s"
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Error starting xvp: %s"
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3807,109 +3801,109 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr "setting network host"
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s released that was not leased"
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
@@ -3917,7 +3911,7 @@ msgstr ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3957,54 +3951,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4056,89 +4050,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr "unpacked context: %s"
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "received %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "no method for message: %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "No method for message: %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID is %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Returning exception %s to caller"
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4166,41 +4160,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4213,59 +4207,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr "Must implement a fallback schedule"
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4330,21 +4324,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4389,29 +4383,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4459,12 +4453,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr "Target %s allocated"
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4479,19 +4473,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4514,32 +4507,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4598,21 +4591,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested return %s"
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
@@ -4621,26 +4614,24 @@ msgstr "Received %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "Failed to open connection to the hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
-msgstr "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
+msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4652,7 +4643,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4677,27 +4668,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4825,67 +4816,67 @@ msgstr "instance %(instance_name)s: deleting instance files %(target)s"
 msgid "instance %s: rebooted"
 msgstr "instance %s: rebooted"
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr "instance %s: rescued"
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr "instance %s: booted"
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr "instance %s: Creating image"
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
@@ -4894,32 +4885,32 @@ msgstr ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr "instance %s: starting toXML method"
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr "instance %s: finished toXML method"
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4971,32 +4962,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "Failed to mount filesystem: %s"
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5015,11 +5006,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
+msgstr ""
+
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5042,183 +5039,183 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "nbd device %s did not show up"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: rebooted"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5228,42 +5225,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5294,151 +5288,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr "Unable to find an open port"
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "received %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "Starting Bridge interface for %s"
+
+#: nova/virt/libvirt/utils.py:395
+#, fuzzy, python-format
+msgid "Wrote: %s"
+msgstr "Re-wrote %s"
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5470,32 +5484,32 @@ msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5577,23 +5591,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5607,225 +5619,203 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:333
+#, fuzzy, python-format
+msgid "Powering on the VM instance"
+msgstr "Going to run %s instances..."
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:385
+#, fuzzy
+msgid "Creating Snapshot of the VM instance"
+msgstr "Creating a raw instance"
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
+msgstr "instance %s: rescued"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:582
+#, fuzzy, python-format
+msgid "Unregistering the VM"
+msgstr "De-registering image %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5835,32 +5825,32 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5870,44 +5860,58 @@ msgstr ""
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, fuzzy, python-format
+msgid "Could not determine key: %s"
+msgstr "Failed to decrypt private key: %s"
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Calling %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "Calling getter %s"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5999,56 +6003,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "group %s already exists"
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6057,233 +6061,223 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, fuzzy, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, fuzzy, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr "(VM_UTILS) xenserver vm state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr "(VM_UTILS) xenapi power_state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -6292,227 +6286,237 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy
 msgid "Starting instance"
 msgstr "Creating a raw instance"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 #, fuzzy
 msgid "Starting VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 #, fuzzy, python-format
 msgid "Finished snapshot and upload for VM"
 msgstr "Finished snapshot and upload for VM %s"
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 #, fuzzy, python-format
 msgid "Starting snapshot for VM"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6556,40 +6560,40 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr "kernel/ramdisk files removed"
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6607,89 +6611,89 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "setting network host"
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -6722,7 +6726,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "Introduced %(label)s as %(sr_ref)s."
@@ -6735,11 +6739,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6807,101 +6811,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Mountpoint cannot be translated: %s"
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
@@ -7038,117 +7042,117 @@ msgstr "rbd has no pool %s"
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog is not working: %s"
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr "Sheepdog is not working"
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Re-exporting %s volumes"
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s: skipping export"
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: creating"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr "volume %(vol_name)s: creating logical volume of size %(vol_size)sG"
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: creating export"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr "Volume is still attached"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr "Volume is not local to this node"
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: snapshotting"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7177,144 +7181,144 @@ msgstr "NotFound raised: %s"
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "Could not find iSCSI export  for volume %s"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "Could not find iSCSI export  for volume %s"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, fuzzy, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, fuzzy, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, fuzzy, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, fuzzy, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
 msgstr "Deleting user %s"
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7368,36 +7372,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7478,6 +7482,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7499,6 +7506,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "Inner Exception: %s"
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7515,6 +7525,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7527,12 +7540,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7581,6 +7621,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7659,6 +7702,58 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr "instance %s: rescuing"
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "instance %s: pausing"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "instance %s: unpausing"
+
+#~ msgid "instance %s: resuming"
+#~ msgstr "instance %s: resuming"
+
+#~ msgid "instance %s: locking"
+#~ msgstr "instance %s: locking"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "instance %s: unlocking"
+
+#~ msgid "instance %s: reset network"
+#~ msgstr "instance %s: reset network"
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7676,15 +7771,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr "python-migrate is not installed. Exiting."
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7872,6 +8014,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr "Attempted to unfilter instance %s which is not filtered"
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr "Task [%(name)s] %(task)s status: success    %(result)s"
 
@@ -7886,6 +8034,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh said: %r"
 
@@ -7900,12 +8051,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7944,6 +8104,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr "Created VM %s..."
 
@@ -7973,6 +8232,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr "(VM_UTILS) xenserver vm state -> |%s|"
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr "(VM_UTILS) xenapi power_state -> |%s|"
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Creating VBD for VDI %s ... "
 
@@ -8164,6 +8429,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index 317c685a6..1f1ed10b2 100644
--- a/nova/locale/en_GB/LC_MESSAGES/nova.po
+++ b/nova/locale/en_GB/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2012-03-30 11:10+0000\n"
 "Last-Translator: Anthony Harrington <untaintableangel@hotmail.co.uk>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -66,11 +66,11 @@ msgstr "Subject for certificate for projects, %s for project, timestamp"
 msgid "Flags path: %s"
 msgstr "Flags path: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Unexpected error while running command."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -85,141 +85,150 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr "DB exception wrapped."
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr "An unknown exception occurred."
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr "Failed to decrypt text"
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr "Failed to paginate through images from image service"
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr "Virtual Interface creation failed"
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "5 attempts to create virtual interface with unique mac address failed"
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr "Connection to glance failed"
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr "Connection to melange failed"
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr "Not authorised."
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr "User does not have admin privileges"
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Policy doesn't allow %(action)s to be performed."
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr "Unacceptable parameters."
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr "Invalid snapshot"
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volume %(volume_id)s is not attached to anything"
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr "Failed to load data into json format"
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr "The request is invalid."
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr "Invalid signature %(signature)s for user %(user)s."
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr "Invalid input received"
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr "Invalid volume type"
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Invalid content type %(content_type)s."
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr "Invalid reuse of an RPC connection."
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -228,12 +237,12 @@ msgstr ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -242,104 +251,100 @@ msgstr ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 
-#: nova/exception.py:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -347,745 +352,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1109,364 +1151,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "Full set of FLAGS:"
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "Inner Exception: %s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "Fetching %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Running cmd (subprocess): %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "Result was %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Running cmd (SSH): %s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Link Local address is not found.:%s"
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Invalid backend: %s"
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1475,241 +1518,246 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 #, fuzzy, python-format
 msgid "Invalid CIDR"
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1750,39 +1798,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1813,31 +1828,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1846,57 +1873,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1991,31 +2018,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2040,216 +2079,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2325,7 +2351,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2418,32 +2443,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2472,23 +2498,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2540,114 +2566,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "instance %s: snapshotting"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2659,262 +2692,273 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2933,496 +2977,476 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executing: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executing |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "instance %s: suspending"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "Instance has already been created"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "VBD not found in instance %s"
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
-msgstr "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
+msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
+msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "instance %s: suspending"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+#, fuzzy, python-format
+msgid "Getting locked state"
 msgstr "instance %s: getting locked state"
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+#, fuzzy, python-format
+msgid "Reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
-msgstr ""
+#: nova/compute/manager.py:1672
+#, fuzzy, python-format
+msgid "Get console output"
+msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr ""
+#: nova/compute/manager.py:1764
+#, fuzzy, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3467,17 +3491,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3486,37 +3510,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr "Use of empty request context is deprecated"
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3524,104 +3548,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3680,117 +3663,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq threw %s"
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d is stale, relaunching dnsmasq"
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "killing radvd threw %s"
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d is stale, relaunching radvd"
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Starting VLAN inteface %s"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Starting Bridge interface for %s"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3798,115 +3786,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3946,54 +3934,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4045,89 +4033,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4155,41 +4143,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4202,59 +4190,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4319,22 +4307,22 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
-#, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
-msgstr ""
+#: nova/scheduler/manager.py:160
+#, fuzzy, python-format
+msgid "Setting instance to %(state)s state."
+msgstr "Invalid instance type %(instance_type)s."
 
 #: nova/scheduler/scheduler_options.py:66
 #, python-format
@@ -4378,29 +4366,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4448,12 +4436,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4468,19 +4456,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4503,32 +4490,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4587,21 +4574,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested return %s"
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
@@ -4610,26 +4597,24 @@ msgstr "Received %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "Failed to open connection to the hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4641,7 +4626,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4666,27 +4651,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4814,99 +4799,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4958,32 +4943,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5002,11 +4987,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
+msgstr ""
+
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5029,184 +5020,184 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: created successfully"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "User does not have admin privileges"
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5216,42 +5207,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5282,151 +5270,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, python-format
+msgid "Read: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "Starting Bridge interface for %s"
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5458,32 +5466,32 @@ msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5565,23 +5573,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5595,225 +5601,200 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
+msgstr "instance %s: resuming"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5823,76 +5804,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Calling %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "Calling getter %s"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5984,56 +5979,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD not found in instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Unable to unplug VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6042,233 +6037,223 @@ msgstr ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, fuzzy, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr "Snapshotting VM %(vm_ref)s with label '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, fuzzy, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Created snapshot %(template_vm_ref)s from VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Size for image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copying VDI %s to /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destroyed"
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Looking up vdi %s for PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s is still available"
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr "(VM_UTILS) xenserver vm state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr "(VM_UTILS) xenapi power_state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-scanning SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -6277,224 +6262,234 @@ msgstr ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Plugging VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Plugging VBD %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destroying VBD for VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destroying VBD for VDI %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Running pygrub against %s"
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Found Xen kernel %s"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "No Xen kernel found.  Booting HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Writing partition table %s done."
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy, python-format
 msgid "Starting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6538,39 +6533,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6588,88 +6583,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creating VIF for VM %(vm_ref)s, network %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6702,7 +6697,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6715,11 +6710,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6787,101 +6782,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
@@ -7018,117 +7013,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Re-exporting %s volumes"
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s: skipping export"
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: creating"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: creating export"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: created successfully"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr "Volume is still attached"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr "Volume is not local to this node"
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removing export"
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: deleting"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: deleted successfully"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: snapshotting"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7156,144 +7151,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7347,36 +7342,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7457,6 +7452,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7478,6 +7476,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "Inner Exception: %s"
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7494,6 +7495,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7506,12 +7510,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7560,6 +7591,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7650,6 +7684,55 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr "instance %s: rescuing"
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "instance %s: pausing"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: locking"
+#~ msgstr "instance %s: locking"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "instance %s: unlocking"
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7667,15 +7750,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7869,6 +7999,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7883,6 +8019,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7897,12 +8036,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7941,6 +8089,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr "Created VM %s..."
 
@@ -7970,6 +8217,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr "(VM_UTILS) xenserver vm state -> |%s|"
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr "(VM_UTILS) xenapi power_state -> |%s|"
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Creating VBD for VDI %s ... "
 
@@ -8167,6 +8420,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index c14f39196..ca8377548 100644
--- a/nova/locale/es/LC_MESSAGES/nova.po
+++ b/nova/locale/es/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2012-04-18 14:35+0000\n"
 "Last-Translator: nat6091 <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -70,11 +70,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr "Ruta a las opciones: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Error inesperado mientras el comando se ejecutaba"
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -89,262 +89,267 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr "Una excepcion desconocida ha ocurrido"
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr "Fallo al desencriptar el texto"
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr "Falló al paginar a través de imágenes del servicio de imagen"
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr "Creacion de interfaz virtual fallida"
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 "Fallaron los 5 intentos de crear una interfaz virtual con una dirección "
 "mac única"
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr "Coneccion con glance fallida"
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr "Falló la conexión a melange"
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr "No Autorizado"
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "La política no permite que la %(action)s se realice"
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr "Parametros inaceptables"
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr "Captura no valida"
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volumen %(volume_id)s no está conectado con nada"
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr "Fallo al ingresar informacion en formato json"
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr "La petición es inválida."
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr "Firma invalida %(signature)s para el usuario %(user)s"
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr "Entrada invalida recibida"
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr "Tipo de volumen no válido"
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Rango de puertos invalido %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Protocolo IP invalido %(protocol)s"
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Tipo de contenido invalido %(content_type)s."
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Cidr %(cidr)s invalido"
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr "Reuso invalido de una coneccion RPC"
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "La instacia %(instance_id)s no se esta ejecutando"
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr "Fallo al resumir el servidor"
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr "El servicio no esta disponible en este momento"
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr "El servicio de computo no esta disponible en este momento"
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 "Incapaz de emigrar la instancia %(instance_id)s al actual anfitrion "
 "(%(host)s)"
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr "El destino del anfitrion de computo no esta disponible en este momento"
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr "El anfitrion de computo no esta disponible en este momento"
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr "Informacion del CPU inaceptable"
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s no es una direccion IP v4/6 valida"
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -352,745 +357,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formato de disco %(disk_format)s no es aceptable"
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, fuzzy, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr "La instacia %(instance_id)s no esta suspendida"
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "El usuario %(uid)s es actualmente miembro del grupo %(group_dn)s"
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "No se puede unir la imagen con el loopback: %s"
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1114,364 +1156,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr "Se detuvo un servicio sin entrada en la base de datos"
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "El servicio objeto de base de datos ha desaparecido, recreándolo."
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr "Recuperada la conexión al servidor de modelos."
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr "el servidor de modelos se ha ido"
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "Conjunto completo de opciones (FLAGS):"
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "Excepción interna: %s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "Obteniendo %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Ejecutando cmd (subprocesos): %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "El resultado fue %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "corriendo cmd (SSH): %s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Depuración de la devolución de llamada: %s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "No se encuentra la dirección del enlace local.:%s"
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "No se pudo obtener enlace de la ip local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "backend inválido: %s"
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr "Demasiados intentos de autenticacion fallidos."
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Fallo de autenticación: %s"
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr "acción: %s"
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "No encontrado: %s"
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Ha sucedido un error desconocido. Por favor repite el intento de nuevo."
 
@@ -1480,242 +1523,247 @@ msgstr "Ha sucedido un error desconocido. Por favor repite el intento de nuevo."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr "Creando par de claves %s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Borrar para de claves %s"
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 #, fuzzy, python-format
 msgid "Invalid CIDR"
 msgstr "Cidr %(cidr)s invalido"
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr "No hay regla para los parámetros especificados."
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regla ya existe en el grupo %s"
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Crear Grupo de Seguridad %s"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr "el grupo %s ya existe"
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Crear volumen de %s GB"
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo no soportado: %s"
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr "Asignar dirección"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar dirección %s"
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr "usuario o grupo no especificado"
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr "sólo el grupo \"all\" está soportado"
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr "operation_type debe ser añadir o eliminar"
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Actualizando imagen %s públicamente"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1756,39 +1804,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1819,31 +1834,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1852,57 +1879,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1997,31 +2024,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, fuzzy, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr "Firma invalida para el usuario %s"
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2046,216 +2085,204 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+#, fuzzy, python-format
+msgid "HostId cannot be updated."
+msgstr "Punto de montaje no puede ser traducido: %s"
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2331,7 +2358,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2424,32 +2450,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2478,23 +2505,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2546,115 +2573,124 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 #, fuzzy, python-format
 msgid "Security group is still in use"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr "Esta regla ya existe en el grupo %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#, fuzzy, python-format
+msgid "start instance"
+msgstr "Reiniciar instancia %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+#, fuzzy, python-format
+msgid "stop instance"
+msgstr "Reiniciar instancia %r"
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "instancia %s: arrancada"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr "Intento de instanciar sigleton"
@@ -2668,271 +2704,282 @@ msgstr ""
 "Se ha intentado eliminar el último miembro de un grupo. Eliminando el "
 "grupo %s en su lugar."
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Buscando usuario: %r"
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Fallo de autorización para la clave de acceso %s"
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Utilizando nombre de proyecto = nombre de usuario (%s)"
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Firma invalida para el usuario %s"
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr "Debes especificar un proyecto"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "Creado el proyecto %(name)s con administrador %(manager_user)s"
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr "Modificando proyecto %s"
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Agregando usuario %(uid)s para el proyecto %(pid)s"
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Borrar usuario %(uid)s del proyecto %(pid)s"
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr "Borrando proyecto %s"
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr "Borrando usuario %s"
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "Cambio de clave de acceso para el usuario %s"
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "Cambio de clave secreta para el usuario %s"
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "No hay datos vpn para el proyecto %s"
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr "Red a insertar en la configuración de openvpn"
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr "Mascara de red a insertar en la configuración de openvpn"
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Lanzando VPN para %s"
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 #, fuzzy, python-format
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
 "este tipo."
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
 "este tipo."
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2951,496 +2998,477 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: ejecutando: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: no ejecutando |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "instancia %s: arrancada"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "La instancia ha sido creada previamente"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
-msgstr "instancia %s: rescatando"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
+msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "instancia %s: pausando"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
+msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "instancia %s: continuando tras pausa"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "instancia %s: obteniendo los diagnosticos"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "instancia %s: suspendiendo"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "instancia %s: continuando"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "instancia %s: bloqueando"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "instancia %s: desbloqueando"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+#, fuzzy, python-format
+msgid "Getting locked state"
 msgstr "instancia %s: pasando a estado bloqueado"
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
-msgstr "instancia %s: reiniciar redes"
+#: nova/compute/manager.py:1647
+#, fuzzy
+msgid "Reset network"
+msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
-msgstr ""
+#: nova/compute/manager.py:1655
+#, fuzzy
+msgid "Inject network info"
+msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+#, fuzzy, python-format
+msgid "Get console output"
+msgstr "Obtener salida de la consola para la instancia %s"
+
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1693
+#: nova/compute/manager.py:1727
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1744
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1764
 #, fuzzy, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
-msgstr "La instancia %(instance_id)s no esta en modo de rescate"
-
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr ""
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
 msgstr "Desvinculando volumen de instancia desconocida %s"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3485,17 +3513,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3504,37 +3532,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr "El uso de una petición de contexto vacía está en desuso"
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3542,104 +3570,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
-msgstr ""
-
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3698,117 +3685,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Excepción al recargar la configuración de dnsmasq: %s"
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "El pid %d está pasado, relanzando dnsmasq"
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "Matando radvd lanzado %s"
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d corrupto, relanzando radvd"
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Iniciando interfaz VLAN %s"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, fuzzy, python-format
+msgid "Failed to add interface: %s"
+msgstr "Fallo al suspender la instancia"
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Iniciando interfaz puente para %s"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3816,115 +3808,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr "configurando la red del host"
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3964,54 +3956,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4063,89 +4055,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr "contenido desempaquetado: %s"
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "recibido %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "No hay método para el mensaje: %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID es %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4173,41 +4165,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4220,59 +4212,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr "Debe de implementar un horario de reserva"
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4337,22 +4329,22 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
-#, fuzzy, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
-msgstr "La instacia %(instance_id)s no esta suspendida"
+#: nova/scheduler/manager.py:160
+#, python-format
+msgid "Setting instance to %(state)s state."
+msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
 #, python-format
@@ -4396,29 +4388,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Después de terminar las instancias: %s"
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4466,12 +4458,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr "Destino %s asignado"
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4486,19 +4478,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4521,32 +4512,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4605,21 +4596,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
@@ -4628,27 +4619,26 @@ msgstr "Recibido %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "Fallo al abrir conexión con el hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
-msgstr ""
+#, fuzzy
+msgid "Filters added to instance"
+msgstr "Fallo a reinicia la instancia"
 
 #: nova/virt/firewall.py:139
 msgid "Provider Firewall Rules refreshed"
@@ -4659,7 +4649,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4684,27 +4674,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4832,99 +4822,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr "instancia %s: rescatada"
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr "instancia %s: arrancada"
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr "instancia %s: Creando imagen"
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr "instancia %s: comenzando método toXML"
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr "instancia %s: finalizado método toXML"
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4976,32 +4966,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "Fallo al montar el sistema de ficheros: %s"
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5020,11 +5010,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr "No se puede unir la imagen con el loopback: %s"
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
+msgstr ""
+
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5047,185 +5043,185 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr "Conexión a libvirt rota"
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5235,42 +5231,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5301,151 +5294,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "recibido %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "Iniciando interfaz puente para %s"
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5477,32 +5490,32 @@ msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5584,23 +5597,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5614,225 +5625,203 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:333
+#, fuzzy, python-format
+msgid "Powering on the VM instance"
+msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:385
+#, fuzzy
+msgid "Creating Snapshot of the VM instance"
+msgstr "Creando una instancia raw"
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
+msgstr "instancia %s: rescatada"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:582
+#, fuzzy, python-format
+msgid "Unregistering the VM"
+msgstr "Des-registrando la imagen %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5842,32 +5831,32 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5876,44 +5865,58 @@ msgstr ""
 "Debes especificar xenapi_connection_url, xenapi_connection_username "
 "(opcional), y xenapi_connection_password para usar connection_type=xenapi"
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obtenida excepción %s"
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr "Lanzando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake no tiene una implementación para %s"
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Llamando %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "Llanado al adquiridor %s"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6005,56 +6008,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD no encontrado en la instancia %s"
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "el grupo %s ya existe"
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Imposible desconectar VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Creado el VBD %(vbd_ref)s para VM %(vm_ref)s, VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6063,461 +6066,461 @@ msgstr ""
 "VDI creado %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "sobre %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, fuzzy, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr "Creando snapshot de la VM %(vm_ref)s con etiqueta '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, fuzzy, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Instantánea creada %(template_vm_ref)s de la VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Tamaño para imagen %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando VDI %s a /boot/guest on dom0"
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s destruído"
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Buscando vid %s para el kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s está todavía disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr "(VM_UTILS) xenserver vm state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr "(VM_UTILS) xenapi power_state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s tiene origen en %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Ejecutando pygrub contra %s"
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen Encontrado %s"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen no encontrado. Reiniciando HVM"
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy
 msgid "Starting instance"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 #, fuzzy, python-format
 msgid "Finished snapshot and upload for VM"
 msgstr "Finalizado el snapshot y la subida de la VM %s"
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 #, fuzzy, python-format
 msgid "Starting snapshot for VM"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "Imposible adjuntar volumen a la instancia %s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6561,39 +6564,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6611,89 +6614,89 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "configurando la red del host"
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Creando VIF para VM %(vm_ref)s, red %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6726,7 +6729,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6739,11 +6742,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6811,105 +6814,105 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Punto de montaje no puede ser traducido: %s"
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "No es posible crear el VDI en SR %(sr_ref)s para la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "No es posible usar SR %(sr_ref)s para la instancia %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Imposible adjuntar volumen a la instancia %s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 "El punto de montaje %(mountpoint)s esta unido a la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Imposible desasociar volumen %s"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7048,117 +7051,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Exportando de nuevo los volumenes %s"
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s: saltando exportación"
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "volumen %s: creando"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr "volume %(vol_name)s: creando lv del tamaño %(vol_size)sG"
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volumen %s: exportando"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volumen %s: creado satisfactoriamente"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr "El volumen todavía está asociado"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr "Volumen no local a este nodo"
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volumen %s: eliminando exportación"
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volumen %s: eliminando"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volumen %s: eliminado satisfactoriamente"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7187,144 +7190,144 @@ msgstr "No encontrado: %s"
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "Imposible encontrar SR en VBD %s"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, fuzzy, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, fuzzy, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, fuzzy, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, fuzzy, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
 msgstr "Borrando usuario %s"
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7378,36 +7381,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7488,6 +7491,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7509,6 +7515,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "Excepción interna: %s"
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7525,6 +7534,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7537,12 +7549,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7591,6 +7630,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7672,6 +7714,61 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr "instancia %s: rescatando"
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "instancia %s: pausando"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "instancia %s: continuando tras pausa"
+
+#~ msgid "instance %s: resuming"
+#~ msgstr "instancia %s: continuando"
+
+#~ msgid "instance %s: locking"
+#~ msgstr "instancia %s: bloqueando"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "instancia %s: desbloqueando"
+
+#~ msgid "instance %s: reset network"
+#~ msgstr "instancia %s: reiniciar redes"
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7689,15 +7786,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7885,6 +8029,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7899,6 +8049,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh dijo: %r"
 
@@ -7913,12 +8066,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7957,6 +8119,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr "Creada VM %s..."
 
@@ -7986,6 +8247,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr "(VM_UTILS) xenserver vm state -> |%s|"
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr "(VM_UTILS) xenapi power_state -> |%s|"
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Creando VBD para VDI %s ... "
 
@@ -8177,6 +8444,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index b11d7634f..4c944a6ef 100644
--- a/nova/locale/fr/LC_MESSAGES/nova.po
+++ b/nova/locale/fr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2012-04-11 14:21+0000\n"
 "Last-Translator: EmmanuelLeNormand <manu@ubuntu-fr.org>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -68,11 +68,11 @@ msgstr "Sujet de certificat pour projets, %s pour le projet, timestamp"
 msgid "Flags path: %s"
 msgstr "Chemin des propriétés: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Erreur imprévue lors de l'éxecution de la commande"
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -87,143 +87,152 @@ msgstr ""
 "Sortie standard : %(stdout)r\n"
 "Sortie d'erreur : %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr "Une exception inconnue s'est produite."
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr "Échec du décryptage du text"
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr "Échec de la pagination à travers les images depuis le service d'image"
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr "La création de l'Interface Virtuelle a échoué"
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 "Les 5 tentatives de création de l'interface virtuelle avec une adresse "
 "MAC unique ont échoué"
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr "La connexion à Glance a échoué"
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr "La connexion à Melange a échoué"
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr "Non autorisé."
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Le réglage des droits n'autorise pas %(action)s à être effectué(e)(s)"
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr "Paramètres inacceptables."
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr "Snapshot invalide"
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Le volume %(volume_id)s n'est lié à rien"
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr "La paire de clés de donnée n'est pas valide"
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr "Échec du chargement des données au format JSON"
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr "La requête est invalide."
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr "La signature %(signature)s est invalide pour l'utilisateur %(user)s."
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr "Entrée invalide reçue"
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr "Type de volume invalide"
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr "Volume invalide"
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "La plage de port %(from_port)s:%(to_port)s. %(msg)s est invalide"
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Le protocole IP %(protocol)s est invalide"
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Le type de contenu %(content_type)s est invalide"
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Le cidr %(cidr)s est invalide"
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr "Réutilisation invalide d'une connexion RPC"
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -232,12 +241,12 @@ msgstr ""
 "Impossible d'effectuer l'action '%(action)s' sur l'ensemble "
 "%(aggregate_id)s. Raison: %(reason)s."
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -246,76 +255,72 @@ msgstr ""
 "L'instance %(instance_uuid)s dans %(attr)s %(state)s. Impossible de "
 "%(method)s pendant que l'instance est dans cet état."
 
-#: nova/exception.py:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "L'instance %(instance_id)s  ne fonctionne pas."
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "L'instance %(instance_id)s  n'est pas suspendue"
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr "Échec de la reprise du serveur"
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr "Le service est indisponible actuellement."
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr "Le service de volume est indisponible actuellement."
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr "Le service de calcul est indisponible actuellement."
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 "Impossible de migrer l'instance (%(instance_id)s) vers l'hôte actuel "
 "(%(host)s)."
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr "L'hôte destinataire de calcul est indisponible actuellement."
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr "L'hôte original de calcul est indisponible actuellement."
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Le type de l'hyperviseur fourni n'est pas valide."
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 "L'instance nécessite une version plus récente de l'hyperviseur que celle "
 "fournie."
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -324,26 +329,26 @@ msgstr ""
 "Le chemin d'accès du disque (%(path)s)  existe déjà, il n'était pas prévu"
 " d'exister."
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Le chemin de périphérique (%(path)s) est invalide."
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Le chemin de périphérique (%(path)s) est invalide."
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr "Info CPU inacceptable"
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s n'est pas une adresse IP v4/6 valide"
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -353,7 +358,7 @@ msgstr ""
 " VLAN prévu est %(tag)s, mais celui qui est associé avec le groupe de "
 "port est %(pgroup)s."
 
-#: nova/exception.py:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -364,114 +369,118 @@ msgstr ""
 "l'adaptateur physique souhaité. VSwitch est %(expected)s, mais la "
 "principale association est %(actual)s."
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Le format de disque %(disk_format)s n'est pas acceptable"
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "L'image %(image_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "L'instance %(instance_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s est inaccepatble."
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr "La ressource n'a pas pu être trouvée."
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr "Le drapeau requis %(flag)s n'est pas défini"
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Le volume %(volume_id)s n'a pas pu être trouvé."
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 "Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
 "%(metadata_key)s."
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Le type de volume %(volume_type_id)s n'a pas été trouvé."
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Le type de volume avec le nom %(volume_type_name)s n'a pas été trouvé."
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Le snapshot %(snapshot_id)s n'a pas été trouvé."
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Aucun disque sur %(location)s"
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Impossible de trouver un gestionnaire pour le %(driver_type)s de volume."
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "L'image href %(image_href)s est invalide."
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
@@ -479,80 +488,80 @@ msgstr ""
 "Certaines images ont été stockées par href. Cette version de l'API ne "
 "prend pas en charge l'affichage d'images hrefs."
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "L'image %(image_id)s n'a pas été trouvée."
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr "L'utilisateur %(user_id)s n'a pas été trouvé."
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Le projet %(project_id)s n'a pas été trouvé."
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr "L'utilisateur %(user_id)s n'est pas un membre du projet %(project_id)s."
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr "Le rôle %(role_id)s n'a pas été trouvé."
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr "Impossible de trouver le SR pour lire/écrire le VDI."
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s est requis pour créer un réseau."
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Aucun réseau trouvé pour le pont %(bridge)s"
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Aucun réseau trouvé pour l'uuid %(uuid)s"
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Aucun réseau trouvé avec le cidr %(cidr)s."
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Aucun réseau trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr "Aucun réseau défini."
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -561,53 +570,53 @@ msgstr ""
 "L'uuid réseau %(network_uuid)s n'est pas présent ou n'a pas été affecté "
 "au projet %(project_id)s."
 
-#: nova/exception.py:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "L'hôte n'est pas configuré pour le réseau (%(network_id)s)."
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "Pas d'adresse IP fixe associée avec l'id %(id)s."
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Pas d'IP fixe trouvée pour l'adresse %(address)s."
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr "L'instance %(instance_id)s n'a aucunes IPs fixes"
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 "Le réseau hôte %(host)s n'a aucunes IPs fixes dans le réseau "
 "%(network_id)s."
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr "L'instance %(instance_id)s ne peut avoir l'IP fixe '%(ip)s'."
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr "L'hôte %(host)s n'a aucunes IPs fixes."
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
@@ -616,139 +625,139 @@ msgstr ""
 "L'adresse IP fixe (%(address)s) n'existe pas dans le réseau "
 "(%(network_uuid)s)."
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr "L'adresse IP fixe %(address)s est déjà utilisée."
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "L'adresse IP fixe %(address)s est invalide."
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr "Aucunes IPs fixes disponibles."
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr "Aucunes IPs fixes trouvées."
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "L'entrée DNS %(name)s existe déjà dans le domaine %(domain)s."
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Aucune IP dynamique trouvée pour l'adresse %(address)s."
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Aucune IP dynamique trouvée pour l'hôte %(host)s."
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "La paire de clés %(name)s est introuvable pour l'utilisateur %(user_id)s"
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Le certificat %(certificate_id)s non trouvé."
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Le service %(service_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "L'hôte %(host)s ne peut pas être trouvé."
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "L'hôte de calcul %(host)s ne peut pas être trouvé."
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Impossible de trouver le binaire %(binary)s sur l'hôte %(host)s."
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr "Le jeton d'authentification %(token)s ne peut pas être trouvé."
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr "La clé d'accès %(access_key)s ne peut pas être trouvée."
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr "Le quota ne peut pas être trouvé"
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Le quota pour le projet %(project_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "La clé d'accès %(access_key)s ne peut pas être trouvée."
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Groupe de sécurité %(security_group_id)s non trouvé."
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "Groupe de sécurité %(security_group_id)s non trouvé pour le projet "
 "%(project_id)s."
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -757,7 +766,7 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s est déjà associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -766,361 +775,396 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s n'est pas associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "La migration %(migration_id)s ne peut être trouvée."
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 "Migration non trouvée pour l'instance %(instance_id)s avec le statut "
 "%(status)s."
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "La console %(console_id)s ne peut être trouvée."
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr "La console pour l'instance %(instance_id)s ne peut être trouvée."
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Le type de console %(console_type)s est invalide "
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr "Aucuns types d'instance trouvés."
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Le type d'instance %(instance_type_id)s ne peut être trouvé."
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Le type d'instance avec le nom %(instance_type_name)s ne peut être trouvé."
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Le Flavor %(flavor_id)s ne peut être trouvé."
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr "La zone %(zone_id)s ne peut être trouvée."
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "La plannification de filtre hôte %(filter_name)s ne peut être trouvée."
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, fuzzy, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+"Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
+"%(metadata_key)s."
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "L'utilisateur %(uid)s est déjà membre du groupe %(group_dn)s"
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1144,250 +1188,251 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "Démarrage du noeud %(topic)s (version %(vcs_string)s)"
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr "Service détruit sans entrée dans la base de données"
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "L'objet du service de base de données à disparru, re-création en cours."
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr "Récupération du modelle de connexion serveur terminée!"
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr "Le modèle de serveur à disparu"
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "Ensemble de propriétés complet :"
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "Exception interne : %s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "Récupèration de %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Execution de la commande (sous-processus) : %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "Le résultat était %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Execution de la cmd (SSH): %s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "Debug dans le rappel : %s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "L'adresse du lien local n'a pas été trouvé :%s"
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Impossible de trouver l'IP du lien local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend invalide : %s"
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr "Vous devez implémenter __call__"
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr "Trop d'erreur d'authentification"
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
@@ -1397,116 +1442,116 @@ msgstr ""
 "d'authentification et sera par conséquent vérouillée pour %(lock_mins)d "
 "minutes."
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Echec d'authentification : %s"
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "Requête authentifiée pour : %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr "action: %s"
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 "Requête non authorisé pour le controlleur=%(controller)s et "
 "l'action=%(action)s"
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "\"Instance non trouvée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "\"Volume non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "\"Non trouvé\" remonté : %s"
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Une erreur inopinée à eu lieu. Merci d'essayer votre requête à nouveau."
 
@@ -1517,246 +1562,251 @@ msgstr ""
 "Requête API non supportée : controleur = %(controller)s, action = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr "Création du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Suppression du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 #, fuzzy, python-format
 msgid "Invalid CIDR"
 msgstr "Le cidr %(cidr)s est invalide"
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Pas assez de parametres pour contruire un règle valide."
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr "Pas de règle pour les paramètres spécifiés."
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorisation du groupe de sécurité %s"
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Cette règle existe déjà dans le groupe %s"
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Création du groupe de sécurité %s"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr "le groupe %s existe déjà"
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Création d'un volume de %s Go"
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribut non reconnu : %s"
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr "Allocation d'adresse"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Association de l'adresse %(public_ip)s avec l'instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr "Début de la destruction d'instance"
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr "Dé-enregitrement de l'image %s"
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Image %(image_location)s enregistré avec l'id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr "Utilisateur ou groupe non spécifié"
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr "Seul le group \"tous\" est supporté"
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 "le type d'opération (operation_type) doit être ajout (add) ou suppression"
 " (remove)"
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Mis à jour de la publication de l'image %s"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1797,39 +1847,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1860,31 +1877,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1893,57 +1922,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -2038,31 +2067,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, fuzzy, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr "Signature non valide pour l'utilisateur %s"
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2087,216 +2128,204 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+#, fuzzy, python-format
+msgid "HostId cannot be updated."
+msgstr "Le point de montage ne peut pas être traduit : %s"
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2372,7 +2401,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2465,32 +2493,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2519,23 +2548,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2587,115 +2616,124 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 #, fuzzy, python-format
 msgid "Security group is still in use"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr "Pas assez de parametres pour contruire un règle valide."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr "Cette règle existe déjà dans le groupe %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#, fuzzy, python-format
+msgid "start instance"
+msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+#, fuzzy, python-format
+msgid "stop instance"
+msgstr "Re-démarrage de l'instance %r"
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "instance %s: a démarrée"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr "Tentative d'instanciation d'un singleton"
@@ -2709,29 +2747,29 @@ msgstr ""
 "Tentative de suppression du dernier membre d'un groupe.  Essayez plutôt "
 "de supprimer le group sur %s."
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Recherche de l'utilisateur : %r"
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Autorisation refusée pour la clef d'accès %s"
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Nom de projet utilisé = nom d'utilisateur (%s)"
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 "Autorisation refusée : pas de projet nommé %(pjid)s "
 "(utilisateur=%(uname)s)"
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
@@ -2740,246 +2778,257 @@ msgstr ""
 "Autorisation refusée : utilisateur %(uname)s n'est ni admin ni membre du "
 "projet %(pjname)s"
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Signature non valide pour l'utilisateur %s"
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr "Le projet doit être spécifié"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "Ajout du rôle %(role)s à l'utilisateur %(uid)s pour le projet %(pid)s"
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr "Ajout du rôle global %(role)s pour l'utilisateur %(uid)s"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 "Suppression du rôle %(role)s pour l'utilisateur %(uid)s dans le projet "
 "%(pid)s"
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr "Suppression du role global %(role)s pour l'utilisateur %(uid)s"
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "Création du projet %(name)s ayant pour manager %(manager_user)s"
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr "modification du projet %s"
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Ajout de l'utilisateur %(uid)s au projet %(pid)s"
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Suppression de l'utilisateur %(uid)s du projet %(pid)s"
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr "Suppression du projet %s"
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "Utilisateur créé %(rvname)s (admin: %(rvadmin)r)"
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "Clef d'accès changée pour l'utilisateur %s"
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "Clef secrète changée pour l'utilisateur %s"
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "Statut admin changé en %(admin)r pour l'utilisateur %(uid)s"
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "Pas de données VPN pour le projet %s"
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr "Réseau à passer à la configuration d'openvpn"
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr "Masque réseau à passer à la configuration d'openvpn"
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Démarrage du VPN pour %s"
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 #, fuzzy, python-format
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
 " type de plus."
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
 " type de plus."
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2998,496 +3047,479 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: décoration : |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin : |%s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: vérouillé : |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin : |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: exécution : |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: ne s'éxécute pas |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy
 msgid "Instance not found."
 msgstr "Aucuns types d'instance trouvés."
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "L'instance a déjà été crée"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Instance actives : %s"
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
-#, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
-msgstr ""
+#: nova/compute/manager.py:1110
+#, fuzzy, python-format
+msgid "injecting file to %(path)s"
+msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
-msgstr "instance %s: récupération"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
+msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+#, fuzzy, python-format
+msgid "Unrescuing"
 msgstr "instance %s: dé-récupération"
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "instance %s: mise en pause"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
+msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "instance %s: reprise après pause"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "instance %s: récupération des diagnostiques"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "instance %s: suspension"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "instance %s: reprise après suspension"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "instance %s: vérrouillage"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "instance %s: déverrouillage"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+#, fuzzy, python-format
+msgid "Getting locked state"
 msgstr "instance %s: récupération de l'état de vérouillage"
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
-msgstr "instance %s: redémarrage du réseau"
+#: nova/compute/manager.py:1647
+#, fuzzy
+msgid "Reset network"
+msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
-msgstr ""
+#: nova/compute/manager.py:1655
+#, fuzzy
+msgid "Inject network info"
+msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
-msgstr ""
+#: nova/compute/manager.py:1672
+#, fuzzy, python-format
+msgid "Get console output"
+msgstr "Récupération de la sortie de la console de l'instance %s"
+
+#: nova/compute/manager.py:1699
+#, fuzzy
+msgid "Getting vnc console"
+msgstr "Ajout de console"
 
-#: nova/compute/manager.py:1693
+#: nova/compute/manager.py:1727
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1744
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1764
 #, fuzzy, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
-msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
-
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr ""
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
 msgstr "Démontage de volume d'une instance inconnue %s"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr "Ajout de console"
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr "Tentative de suppression d'une console non existante %(console_id)s."
@@ -3532,17 +3564,17 @@ msgstr "Re-démarrage xvp"
 msgid "xvp not running..."
 msgstr "xvp non actif..."
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3551,142 +3583,102 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr "L'utilisation d'une requête de contexte vide est dévalué"
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
-msgstr "python-migrate n'est pas installé. Fin d'éxécution."
-
-#: nova/db/sqlalchemy/migration.py:78
+#: nova/db/sqlalchemy/migration.py:74
 msgid "version should be an integer"
 msgstr ""
 
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
 #: nova/db/sqlalchemy/session.py:137
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr ""
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+#, fuzzy
+msgid "foreign key could not be dropped"
+msgstr "Le quota ne peut pas être trouvé"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
-msgstr ""
-
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3745,117 +3737,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "Hupping dnsmasq à renvoyé %s"
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d est dépassé, re-démarrage de dnsmasq"
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "La destruction de radvd à renvoyé %s"
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d est dépassé, re-démarrage radvd"
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Démarrage de l'interface VLAN %s"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, fuzzy, python-format
+msgid "Failed to add interface: %s"
+msgstr "Échec de la suspension de l'instance"
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Démarrage de l'interface de Bridge %s"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Erreur au démarrage xvp : %s"
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr "Le certificat %(certificate_id)s non trouvé."
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3863,115 +3860,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "IP %s libérée qui n'était pas allouée"
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "La somme du nombre de réseau et le début de vlan ne peut excéder 4094"
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4011,54 +4008,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4110,89 +4107,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr "Contexte décompacté : %s"
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "%s reçu"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "Pas de méthode pour le message : %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID est %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Renvoi de l'exception %s à l'appelant"
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4220,41 +4217,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4267,59 +4264,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr "Doit mettre en oeuvre un calendrier de retrait"
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4384,24 +4381,22 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, fuzzy, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
-msgstr ""
-"Migration non trouvée pour l'instance %(instance_id)s avec le statut "
-"%(status)s."
+msgid "Setting instance to %(state)s state."
+msgstr "L'instance de type %(instance_type)s est invalide."
 
 #: nova/scheduler/scheduler_options.py:66
 #, python-format
@@ -4445,29 +4440,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr "Instance actives : %s"
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Après l'arrêt d'instances : %s"
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4515,12 +4510,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr "Destination %s allouée"
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4535,19 +4530,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4570,32 +4564,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4654,21 +4648,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Reception par Nested %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr "Nested renvoi %s"
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
@@ -4677,27 +4671,26 @@ msgstr "%s Reçu"
 msgid "Failed to open connection to the hypervisor"
 msgstr "Échec lors de l'ouverture d'une connexion à l'hyperviseur"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
-msgstr "Tentative de suppression de filtre pour l'intance %s qui n'est pas filtrée"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
+msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
-msgstr ""
+#, fuzzy
+msgid "Filters added to instance"
+msgstr "Échec du redémarrage de l'instance"
 
 #: nova/virt/firewall.py:139
 msgid "Provider Firewall Rules refreshed"
@@ -4708,7 +4701,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4733,27 +4726,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4881,67 +4874,67 @@ msgstr "instance %(instance_name)s: suppression des fichiers d'instance %(target
 msgid "instance %s: rebooted"
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr "instance %s: récupérée"
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr "instance %s: a démarrée"
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr "instance %s : Création de l'image"
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
@@ -4950,32 +4943,32 @@ msgstr ""
 "instance %(inst_name)s : l'erreur d'injection de donné dans l'image "
 "%(img_id)s (%(e)s) a été ignorée"
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr "instance %s: démarrage de la méthode toXML"
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr "instance %s: fin d'éxécution de la méthode toXML"
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5027,32 +5020,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "Impossible de monter le système de fichier : %s"
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5071,11 +5064,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr "Impossible de lier l'image au loopback : %s"
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5098,185 +5097,185 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "Device nbd %s n'est pas apparu"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr "Connexion à libvirt interrompue"
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5286,42 +5285,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5352,151 +5348,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr "Impossible de trouver un port ouvert"
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "%s reçu"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "Démarrage de l'interface de Bridge %s"
+
+#: nova/virt/libvirt/utils.py:395
+#, fuzzy, python-format
+msgid "Wrote: %s"
+msgstr "Ré-écriture de %s"
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5528,32 +5544,32 @@ msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5635,23 +5651,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5665,225 +5679,203 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:333
+#, fuzzy, python-format
+msgid "Powering on the VM instance"
+msgstr "Démarrage de %s instances..."
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:385
+#, fuzzy
+msgid "Creating Snapshot of the VM instance"
+msgstr "Création d'une instance raw"
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
+msgstr "instance %s: récupérée"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:582
+#, fuzzy, python-format
+msgid "Unregistering the VM"
+msgstr "Dé-enregitrement de l'image %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5893,32 +5885,32 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5928,44 +5920,58 @@ msgstr ""
 "(optionel), et xenapi_connection_password pour utiliser "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, fuzzy, python-format
+msgid "Could not determine key: %s"
+msgstr "Impossible de déchiffrer la clef privée : %s"
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr "Reçu exception : %s"
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr "Fonction non implémentée"
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake n'a pas d'implémentation pour %s"
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Appel %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "Appel du getter %s"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6057,56 +6063,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD non trouvé dans l'instance %s"
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "le groupe %s existe déjà"
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Impossible de deconnecter le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD créé %(vbd_ref)s pour VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6115,236 +6121,226 @@ msgstr ""
 "VDI créé %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) on"
 " %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, fuzzy, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 "Création de l'instantané (snapshot) pour la VM %(vm_ref)s avec le label "
 "'%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, fuzzy, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Instantané (snapshot) créé %(template_vm_ref)s pour la  VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Taille de l'image %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copie de VDI %s vers /boot/guest sur dom0"
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Noyau/Ramdisk VDI %s détruit"
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Recherche du VDI %s pour le PV kernel"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr "Le VDI %s est toujours disponible"
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr "(VM_UTILS) état xenserver vm -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr "(VM_UTILS) xenapi power_state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-parcours de SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s à pour parent %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
@@ -6353,228 +6349,238 @@ msgstr ""
 "L'UUID parent %(parent_uuid)s ne correspond pas au parent originel "
 "%(original_parent_uuid)s, attente de coalesence..."
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Connexion de VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Connexion de VBD %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruction de VBD pour la VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Destruction de VBD pour la VDI %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Exécution de pygrub sur %s"
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen %s trouvé"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Pas de kernel Xen trouvé.  Démarrage en HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Ecriture de la table de partitionnement %s terminée."
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy
 msgid "Starting instance"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 #, fuzzy
 msgid "Starting VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 #, fuzzy, python-format
 msgid "Finished snapshot and upload for VM"
 msgstr "Fin de l'instantané et du chargement de VM %s"
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 #, fuzzy, python-format
 msgid "Starting snapshot for VM"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6618,40 +6624,40 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr "Fichiers noyau/ramdisk supprimés"
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6669,89 +6675,89 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Création du VIF pour la VM %(vm_ref)s, réseau %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erreur OpenSSL : %s"
@@ -6784,7 +6790,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "%(label)s introduit comme %(sr_ref)s."
@@ -6797,11 +6803,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6869,105 +6875,105 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Le point de montage ne peut pas être traduit : %s"
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "Impossible de créer VDI sur SR %(sr_ref)s pour l'instance "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Impossible d'utiliser SR %(sr_ref)s pour l'instance %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 "Le point de montage %(mountpoint)s a été attaché à l'instance "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Impossible de trouver le volume %s"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Impossible de détacher le volume %s"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -7106,117 +7112,117 @@ msgstr "rbd n'as pas de file %s"
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog n'est pas actif : %s"
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr "Sheepdog n'est pas actif"
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Ré-exportation de %s volumes"
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s : exportation évitée"
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: création"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr "volume %(vol_name)s: cŕeation d'un volume logique de %(vol_size)sG"
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: exportation en cours"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: crée avec succès"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr "Le volume est encore attaché"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr "Le volume n'est pas local à ce noeud"
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: suppression de l'exportation"
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: suppression"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: supprimé avec succès"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7245,144 +7251,144 @@ msgstr "\"Non trouvé\" remonté : %s"
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "Imposible de trouver une exportation iSCSI pour le volume %s"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "Imposible de trouver une exportation iSCSI pour le volume %s"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, fuzzy, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, fuzzy, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, fuzzy, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, fuzzy, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7436,36 +7442,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7546,6 +7552,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr "Le service de volume est indisponible actuellement."
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7564,6 +7573,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "Exception interne : %s"
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7580,6 +7592,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7592,12 +7607,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7646,6 +7688,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7724,6 +7769,58 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr "instance %s: récupération"
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "instance %s: mise en pause"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "instance %s: reprise après pause"
+
+#~ msgid "instance %s: resuming"
+#~ msgstr "instance %s: reprise après suspension"
+
+#~ msgid "instance %s: locking"
+#~ msgstr "instance %s: vérrouillage"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "instance %s: déverrouillage"
+
+#~ msgid "instance %s: reset network"
+#~ msgstr "instance %s: redémarrage du réseau"
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7741,15 +7838,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr "python-migrate n'est pas installé. Fin d'éxécution."
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7939,6 +8083,14 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+#~ "Tentative de suppression de filtre pour"
+#~ " l'intance %s qui n'est pas filtrée"
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr "Tâche [%(name)s] %(task)s état : succès   %(result)s"
 
@@ -7953,6 +8105,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh a retourné : %r"
 
@@ -7967,12 +8122,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -8011,6 +8175,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr "VM %s crée..."
 
@@ -8040,6 +8303,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr "(VM_UTILS) état xenserver vm -> |%s|"
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr "(VM_UTILS) xenapi power_state -> |%s|"
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Création de VBD pour la VDI %s ... "
 
@@ -8231,6 +8500,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index 5e1d6c5ef..731c8bde3 100644
--- a/nova/locale/it/LC_MESSAGES/nova.po
+++ b/nova/locale/it/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2012-04-01 18:59+0000\n"
 "Last-Translator: simone.sandri <lexluxsox@hotmail.it>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -66,11 +66,11 @@ msgstr "Soggetto per il certificato dei progetti, %s per progetto, orario"
 msgid "Flags path: %s"
 msgstr "Percorso dei flags: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Si e' verificato un errore inatteso durante l'esecuzione del comando."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -85,258 +85,263 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr "E' stato riscontrato un errore sconosciuto"
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr "Parametri inaccettabili."
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr "La richiesta non è valida."
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr "E' stato ricevuto un input non valido"
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr "Tipo del volume non valido"
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr "Volume non valido"
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr "Impossibile ripristinare il server"
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -344,745 +349,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1106,364 +1148,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr "Servizio terminato che non ha entry nel database"
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "Il servizio é scomparso dal database, ricreo."
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr "Connessione al model server ripristinata!"
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr "model server é scomparso"
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "Insieme di FLAGS:"
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "Eccezione interna: %s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "Prelievo %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Esecuzione del comando (sottoprocesso): %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "Il risultato é %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Eseguendo cmd (SSH): %s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "debug in callback: %s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1472,240 +1515,245 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1746,39 +1794,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1809,31 +1824,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1842,57 +1869,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1987,31 +2014,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2036,216 +2075,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2321,7 +2347,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2414,32 +2439,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2468,23 +2494,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2536,114 +2562,123 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#, fuzzy
+msgid "start instance"
+msgstr "Impossibile riavviare l'istanza"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+#, fuzzy
+msgid "stop instance"
+msgstr "Impossibile sospendere l'istanza"
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "istanza %s: creazione snapshot in corso"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2655,263 +2690,274 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2930,496 +2976,474 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorazione: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: bloccato: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: esecuzione: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: non esecuzione |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "L'istanza é stata già creata"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "istanza %s: in pausa"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
+msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "istanza %s: fuori pausa"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "istanza %s: ricezione diagnostiche"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "istanza %s: ripristino"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "istanza %s: bloccato"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "istanza %s: sbloccato"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+#, fuzzy, python-format
+msgid "Reset network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr ""
+#: nova/compute/manager.py:1764
+#, fuzzy, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
-msgstr ""
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
+msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3464,17 +3488,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3483,37 +3507,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3521,104 +3545,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3677,117 +3660,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Avviando l'interfaccia VLAN %s"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, fuzzy, python-format
+msgid "Failed to add interface: %s"
+msgstr "Impossibile sospendere l'istanza"
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Avviando l'interfaccia Bridge per %s"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3795,115 +3783,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3943,54 +3931,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4042,89 +4030,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr "contesto decompresso: %s"
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "ricevuto %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "nessun metodo per il messagggio: %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID é %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Sollevando eccezione %s al chiamante"
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4152,41 +4140,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4199,59 +4187,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4316,21 +4304,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4375,29 +4363,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4445,12 +4433,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4465,19 +4453,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4500,32 +4487,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4584,21 +4571,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4607,27 +4594,26 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr "Fallita l'apertura della connessione verso l'hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
-msgstr ""
+#, fuzzy
+msgid "Filters added to instance"
+msgstr "Impossibile riavviare l'istanza"
 
 #: nova/virt/firewall.py:139
 msgid "Provider Firewall Rules refreshed"
@@ -4638,7 +4624,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4663,27 +4649,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4811,99 +4797,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4955,32 +4941,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4999,11 +4985,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5026,185 +5018,185 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: creato con successo"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5214,42 +5206,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5280,151 +5269,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "ricevuto %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "Avviando l'interfaccia Bridge per %s"
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5456,32 +5465,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5563,23 +5572,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5593,225 +5600,200 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
+msgstr "istanza %s: ripristino"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5821,76 +5803,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr "Sollevando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Chiamando %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "Dichiarando la coda %s"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5980,515 +5976,515 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk VDI %s distrutti"
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Cercando vdi %s per kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy, python-format
 msgid "Starting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6532,39 +6528,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6582,88 +6578,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6696,7 +6692,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6709,11 +6705,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6781,101 +6777,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Impossible creare il VDI su SR %(sr_ref)s per l'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Impossibile usare SR %(sr_ref)s per l'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Mountpoint %(mountpoint)s smontato dall'istanza %(instance_name)s"
@@ -7012,117 +7008,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: creazione in corso"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: creazione in corso per l'esportazione"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: creato con successo"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr "Volume ancora collegato"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: rimuovendo"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: rimosso con successo"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7151,144 +7147,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, python-format
 msgid "Deleting volumeID: %s"
 msgstr ""
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7342,36 +7338,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7452,6 +7448,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7473,6 +7472,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "Eccezione interna: %s"
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7489,6 +7491,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7501,12 +7506,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7555,6 +7587,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7645,6 +7680,61 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "istanza %s: in pausa"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "istanza %s: fuori pausa"
+
+#~ msgid "instance %s: locking"
+#~ msgstr "istanza %s: bloccato"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "istanza %s: sbloccato"
+
+#~ msgid "instance %s: getting locked state"
+#~ msgstr ""
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid "Detaching volume from unknown instance %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7662,15 +7752,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7810,9 +7947,6 @@ msgstr ""
 #~ msgid "Publishing to route %s"
 #~ msgstr "Pubblicando sulla route %s"
 
-#~ msgid "Declaring queue %s"
-#~ msgstr "Dichiarando la coda %s"
-
 #~ msgid "Declaring exchange %s"
 #~ msgstr "Dichiarando il centralino %s"
 
@@ -7858,6 +7992,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7872,6 +8012,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7886,12 +8029,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7930,6 +8082,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr "Creata VM %s.."
 
@@ -7968,6 +8219,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8168,6 +8425,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index 3895fcc32..9211652a7 100644
--- a/nova/locale/ja/LC_MESSAGES/nova.po
+++ b/nova/locale/ja/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2011-08-23 11:22+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: \n"
@@ -66,11 +66,11 @@ msgstr "プロジェクトの証明書のサブジェクト、%s はプロジェ
 msgid "Flags path: %s"
 msgstr "Flags のパス: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "コマンド実行において予期しないエラーが発生しました。"
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -85,258 +85,263 @@ msgstr ""
 "標準出力: %(stdout)r\n"
 "標準エラー出力: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "メッセージ %s に対するメソッドが存在しません。"
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -344,745 +349,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "ユーザ %(uid)s はすでにグループ %(group_dn)s のメンバです。"
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "イメージをループバック %s にアタッチできません。"
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1106,364 +1148,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "%(topic)s ノードを開始しています (バージョン %(vcs_string)s)"
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr "データベースにエントリの存在しないサービスを終了します。"
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "サービスデータベースオブジェクトが消滅しました。再作成します。"
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr "モデルサーバへの接続を復旧しました。"
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr "モデルサーバが消滅しました。"
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "FLAGSの一覧:"
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "内側で発生した例外： %s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "ファイルをフェッチ： %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "コマンド実行(subprocess): %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "コマンド実行結果： %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "コマンド（SSH)を実行: %s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "コールバック中のデバッグ: %s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "リンクローカルアドレスが見つかりません: %s"
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "%(interface)s のローカルIPアドレスのリンクが取得できません:%(ex)s"
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "不正なバックエンドです: %s"
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr "バックエンドは %s です。"
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr "__call__ を実装しなければなりません"
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr "認証失敗の回数が多すぎます。"
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr "アクセスキー %(access_key)s は %(failures)d 回認証に失敗しましたので、%(lock_mins)d 分間ロックします。"
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "%s の認証に失敗しました。"
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "%(uname)s 用の認証リクエスト:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr "アクション(action): %s"
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "引数: %(key)s\t\t値: %(value)s"
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "コントローラ=%(controller)s とアクション=%(action)s 用の許可されていないリクエスト"
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "InstanceNotFound が発行されました: %s"
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "VolumeNotFound が発行されました: %s"
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound 発生: %s"
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "予期しないエラー発生: %s"
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "未知のエラーが発生しました。再度リクエストを実行してください。"
 
@@ -1472,241 +1515,246 @@ msgstr "未知のエラーが発生しました。再度リクエストを実行
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "未サポートの API リクエスト: コントローラ = %(controller)s, アクション = %(action)s"
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair: キーペア %s を作成します。"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair: キーペア %s を削除します。"
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "有効なルールを作成する為の十分なパラメータがありません"
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr "指定されたパラメータに該当するルールがありません。"
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress: セキュリティグループ許可 %s"
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "指定されたルールは既にグループ %s に存在しています。"
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group: セキュリティグループ %s を作成します。"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除します。"
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume: %s GBのボリュームを作成します。"
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s のデバイス %(device)s に接続"
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Detach volume: ボリューム %s をデタッチします"
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "アトリビュート %s はサポートされていません。"
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr "Allocate address: アドレスを割り当てます。"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr "Release address: アドレス %s を開放します。"
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "インスタンス %(instance_id)s にアドレス %(public_ip)s を割り当て"
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address: アドレス %s の関連付けを解除します。"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr "インスタンス終了処理を開始します。"
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image: イメージ %s を登録解除します。"
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "イメージ %(image_location)s が ID %(image_id)s で登録されました"
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr "ユーザまたはグループが指定されていません。"
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr "グループ  \"all\" のみサポートされています。"
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr "operation_type は add または remove の何れかである必要があります。"
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "イメージ %s の公開設定を更新します。"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1747,39 +1795,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1810,31 +1825,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1843,57 +1870,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1988,31 +2015,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, fuzzy, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr "Invalid signature: ユーザ %s の署名が不正です。"
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2037,216 +2076,204 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+#, fuzzy, python-format
+msgid "HostId cannot be updated."
+msgstr "マウントポイントを変換できません。 %s"
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2322,7 +2349,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2415,32 +2441,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2469,23 +2496,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2537,115 +2564,124 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 #, fuzzy, python-format
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress: セキュリティグループ許可 %s の取消"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr "有効なルールを作成する為の十分なパラメータがありません"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr "指定されたルールは既にグループ %s に存在しています。"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#, fuzzy, python-format
+msgid "start instance"
+msgstr "Reboot instance: インスタンス %r を再起動します。"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+#, fuzzy, python-format
+msgid "stop instance"
+msgstr "Reboot instance: インスタンス %r を再起動します。"
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "インスタンス %s: 起動しました。"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr "シングルトンをインスタンス化しようとしました。"
@@ -2657,267 +2693,278 @@ msgid ""
 "instead."
 msgstr "グループの最後のメンバーを削除しようとしました。代わりにグループ %s を削除してください。"
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr "ユーザ %r を検索します。"
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Failed authorization: アクセスキー %s の認証に失敗しました。"
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "ユーザ名 (%s) をプロジェクト名として使用します。"
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr "許可されません: %(pjid)s という名称のプロジェクトはありません (ユーザ=%(uname)s)"
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr "許可されません: ユーザ %(uname)s は管理者でもプロジェクト %(pjname)s のメンバでもありません。"
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Invalid signature: ユーザ %s の署名が不正です。"
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr "プロジェクトを指定してください。"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "プロジェクト %(pid)s のユーザ %(uid)s にロール %(role)s を付与します。"
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr "サイト共通のロール %(role)s をユーザ %(uid)s に付与します。"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr "プロジェクト %(pid)s のユーザ  %(uid)s  からロール %(role)s を削除します。"
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr "ユーザ %(uid)s からサイト共通のロール %(role)s を削除します。"
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "プロジェクト %(name)s を管理者 %(manager_user)s で作成しました。"
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr "modifying project: プロジェクト %s を更新します。"
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "ユーザ %(uid)s をプロジェクト %(pid)s に追加します。"
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "ユーザ %(uid)s をプロジェクト %(pid)s から削除します。"
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr "Deleting project: プロジェクト %s を削除します。"
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "ユーザ %(rvname)s を作成しました。(管理者: %(rvadmin)r)"
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "Access Key change: ユーザ %s のアクセスキーを更新します。"
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "Secret Key change: ユーザ %s のシークレットキーを更新します。"
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "ユーザ %(uid)s に対して管理者状態が %(admin)r に設定されました。"
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "プロジェクト %s に関するvpnデータがありません。"
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
 msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr "openvpnの設定に入れるネットワークの値"
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr "openvpnの設定に入れるネットマスクの値"
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "%s 用のVPNを起動します。"
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 #, fuzzy, python-format
 msgid "Cannot run any more instances of this type."
 msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "インスタンスのクオータを超えました。このタイプにおいてはあと %s インスタンスしか実行できません。"
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "%s を停止しようとしています"
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2936,496 +2983,479 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executing: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executing |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy, python-format
 msgid "Instance not found."
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "インスタンスは既に生成されています。"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "インスタンス %s は実行中です。"
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Rebooting instance: インスタンス %s を再起動します。"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
-#, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
-msgstr ""
+#: nova/compute/manager.py:1110
+#, fuzzy, python-format
+msgid "injecting file to %(path)s"
+msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
-msgstr "Rescuing: インスタンス %s をレスキューします。"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
+msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+#, fuzzy, python-format
+msgid "Unrescuing"
 msgstr "Unrescuing: インスタンス %s をアンレスキューします。"
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "pausing: インスタンス %s を一時停止します。"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
+msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "unpausing: インスタンス %s の一時停止を解除します。"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "retrieving diagnostics: インスタンス %s の診断情報を取得します。"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "suspending: インスタンス %s をサスペンドします。"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "resuming: インスタンス %s をレジュームします。"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "locking: インスタンス %s をロックします。"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "unlocking: インスタンス %s のロックを解除します。"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+#, fuzzy, python-format
+msgid "Getting locked state"
 msgstr "getting locked state: インスタンス %s のロックを取得しました。"
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
-msgstr "インスタンス %s: ネットワークをリセットします"
+#: nova/compute/manager.py:1647
+#, fuzzy
+msgid "Reset network"
+msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
-msgstr ""
+#: nova/compute/manager.py:1655
+#, fuzzy
+msgid "Inject network info"
+msgstr "ネットワークホストの設定をします。"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
-msgstr ""
+#: nova/compute/manager.py:1672
+#, fuzzy, python-format
+msgid "Get console output"
+msgstr "Get console output: インスタンス %s のコンソール出力を取得します。"
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
-msgstr ""
+#: nova/compute/manager.py:1699
+#, fuzzy
+msgid "Getting vnc console"
+msgstr "コンソールを追加しています"
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr ""
+#: nova/compute/manager.py:1764
+#, fuzzy, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
 msgstr "ボリュームを未知のインスタンス %s からデタッチします。"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr "コンソールを追加しています"
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr "存在しないコンソール %(console_id)s を削除しようとしました"
@@ -3470,17 +3500,17 @@ msgstr "xvp を再起動しています"
 msgid "xvp not running..."
 msgstr "xvp が実行されていません…"
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3489,142 +3519,101 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr "Request context を空とすることは非推奨です。"
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
-msgstr "python-migrate がインストールされていません。終了します。"
-
-#: nova/db/sqlalchemy/migration.py:78
+#: nova/db/sqlalchemy/migration.py:74
 msgid "version should be an integer"
 msgstr ""
 
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
 #: nova/db/sqlalchemy/session.py:137
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3683,117 +3672,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "dnsmasqに対してhupを送信しましたが %s が発生しました。"
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d は無効です。dnsmasqを再実行します。"
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "radvd  停止が %s 例外を発行しました"
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d がストールしているので radvd を再実行しています…"
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "VLANインタフェース %s を開始します。"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "%s 用のブリッジインタフェースを開始します。"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, fuzzy, python-format
+msgid "Failed to add interface: %s"
+msgstr "プライベートキーの復号に失敗しました: %s"
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "%s 用のブリッジインタフェースを開始します。"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "xvp の開始中にエラー: %s"
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3801,115 +3795,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "リースしていないIP %s が開放されました。"
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "ネットワークの数とVLANの開始番号の和は 4094 より大きくできません。"
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3949,54 +3943,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4048,89 +4042,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr "context  %s をアンパックしました。"
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "受信： %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "メッセージ %s に対するメソッドが存在しません。"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "メッセージ %s に対するメソッドが存在しません。"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_IDは %s です。"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "呼び出し元に 例外 %s を返却します。"
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4158,41 +4152,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4205,59 +4199,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr "予備の(fallback)スケジューラを実装する必要があります。"
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4322,21 +4316,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4381,29 +4375,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr "インスタンス %s は実行中です。"
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "インスタンス %s を終了した後です。"
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4451,12 +4445,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr "ターゲット %s をアロケートしました。"
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4471,19 +4465,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4506,32 +4499,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4590,21 +4583,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "Nested received %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr "ネストした戻り値: %s"
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr "%s を受信。"
@@ -4613,26 +4606,24 @@ msgstr "%s を受信。"
 msgid "Failed to open connection to the hypervisor"
 msgstr "ハイパーバイザへの接続に失敗しました。"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
-msgstr "フィルタされていないインスタンス %s のフィルタ解除を試行しました"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
+msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4644,7 +4635,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4669,27 +4660,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4817,99 +4808,99 @@ msgstr "インスタンス %(instance_name)s: インスタンスファイル群
 msgid "instance %s: rebooted"
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr "インスタンス %s: rescued"
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr "インスタンス %s: 起動しました。"
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr "インスタンス %s のイメージを生成します。"
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr "インスタンス %(inst_name)s: イメージ %(img_id)s へのデータ埋め込みのエラーを無視しています (%(e)s)"
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr "インスタンス %s: toXML メソッドを開始。"
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr "インスタンス %s: toXML メソッドを完了。"
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4961,32 +4952,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "ファイルシステム %s のマウントに失敗しました。"
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5005,11 +4996,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr "イメージをループバック %s にアタッチできません。"
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
+msgstr ""
+
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5032,183 +5029,183 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr "nbd デバイス %s が出現しません"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "libvirt %s へ接続します。"
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr "libvirtへの接続が切れています。"
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "インスタンス%s: 再起動しました。"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "データ: %(data)r, ファイルパス: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5218,42 +5215,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5284,151 +5278,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr "開いたポートが見つかりません"
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "受信： %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "%s 用のブリッジインタフェースを開始します。"
+
+#: nova/virt/libvirt/utils.py:395
+#, fuzzy, python-format
+msgid "Wrote: %s"
+msgstr "%s を再度書き込みました"
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5460,32 +5474,32 @@ msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5567,23 +5581,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5597,225 +5609,203 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:333
+#, fuzzy, python-format
+msgid "Powering on the VM instance"
+msgstr "%s 個のインスタンスの起動を始めます…"
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:385
+#, fuzzy
+msgid "Creating Snapshot of the VM instance"
+msgstr "raw instanceを生成します。"
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
+msgstr "インスタンス %s: rescued"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:582
+#, fuzzy, python-format
+msgid "Unregistering the VM"
+msgstr "De-registering image: イメージ %s を登録解除します。"
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5825,32 +5815,32 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5859,44 +5849,58 @@ msgstr ""
 "connection_type=xenapi を使用するには、以下の指定が必要です： xenapi_connection_url, "
 "xenapi_connection_username (オプション), xenapi_connection_password"
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, fuzzy, python-format
+msgid "Could not determine key: %s"
+msgstr "プライベートキーの復号に失敗しました: %s"
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr "例外 %s が発生しました。"
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr "NotImplemented 例外を発生させます。"
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake には %s が実装されていません。"
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "%(localname)s %(impl)s を呼び出します。"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr "getter %s をコールします。"
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "getter %s をコールします。"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5986,56 +5990,56 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "インスタンス %s のVBDが見つかりません。"
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "グループ %s は既に存在しています。"
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "VBD %s の unplug に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "VBD %s の削除に失敗しました。"
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VM %(vm_ref)s, VDI %(vdi_ref)s 用仮想ブロックデバイス(VBD) %(vbd_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6044,462 +6048,462 @@ msgstr ""
 "%(sr_ref)s 上に VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, "
 "%(read_only)s) を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, fuzzy, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr "ラベル '%(label)s' 付き VM %(vm_ref)s のスナップショットを作成しています…"
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, fuzzy, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr "VM %(vm_ref)s からスナップショット %(template_vm_ref)s を作成しました。"
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "ID %(image_id)s として %(vdi_uuids)s のアップロードの為に xapi を問い合わせしています"
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "イメージ %(image)s のサイズ:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "ドメイン0 上の /boot/guest に VDI %s をコピー中"
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "カーネル/RAMディスク VDI %s が削除されました"
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "PV kernelのvdi %s を取得します。"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s は依然として存在しています。"
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr "(VM_UTILS) xenserver の vm state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr "(VM_UTILS) xenapi の power_state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "SR %s を再スキャンします。"
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s の親は %(parent_ref)s です"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "親 %(parent_uuid)s が元々の親 %(original_parent_uuid)s と一致しません。作成を待機しています…"
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "VBD %s を接続しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "仮想ブロックデバイス(VBD) %s の接続が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)を削除しています… "
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "VDI %s 用の仮想ブロックデバイス(VBD)の削除が完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "%s に対して pygrub を実行しています"
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Xen Kernel %s が見つかりました。"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 "No Xen kernel found.  Booting HVM.\r\n"
 "Xen 用カーネルが見つかりません。完全仮想化モード(HVM)で起動しています。"
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "パーティションテーブル %s の書き込みが完了しました。"
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy
 msgid "Starting instance"
 msgstr "raw instanceを生成します。"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 #, fuzzy
 msgid "Starting VM"
 msgstr "xvp を再起動しています"
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "ファイルパス '%s' を埋め込んでいます"
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 #, fuzzy, python-format
 msgid "Finished snapshot and upload for VM"
 msgstr "VM %s のスナップショットとアップロードが完了しました。"
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 #, fuzzy, python-format
 msgid "Starting snapshot for VM"
 msgstr "VM %s に対するスナップショットを開始します。"
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "インスタンス %s にボリュームを接続(attach)できません。"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6543,40 +6547,40 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr "カーネル/RAMディスクファイルが削除されました"
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 #, fuzzy
 msgid "Destroying VM"
 msgstr "xvp を再起動しています"
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6594,89 +6598,89 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "ネットワークホストの設定をします。"
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "VM %(vm_ref)s, network %(network_ref)s 用仮想インターフェース(VIF)を作成しています。"
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL エラー: %s"
@@ -6709,7 +6713,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "%(sr_ref)s として %(label)s を導入しました"
@@ -6722,11 +6726,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6794,101 +6798,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr "マウントポイントを変換できません。 %s"
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s 用のSR %(sr_ref)s における VDI を作成できません"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s 用のSR %(sr_ref)s が使用できません"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "インスタンス %s にボリュームを接続(attach)できません。"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s にマウントポイント %(mountpoint)s を接続(attach)しました"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "ボリューム %s の存在が確認できません。"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "ボリューム %s を切断(detach)できません"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "インスタンス %(instance_name)s からマウントポイント %(mountpoint)s を切断(detach)しました"
@@ -7025,117 +7029,117 @@ msgstr "rbd にプール %s がありません。"
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog が動作していません: %s"
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr "Sheepdog が機能していません"
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "%s 個のボリュームを再エクスポートします。"
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "ボリューム %s のエキスポートをスキップします。"
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "ボリューム%sを作成します。"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr "ボリューム %(vol_name)s: サイズ %(vol_size)sG のlvを作成します。"
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "ボリューム %s をエクスポートします。"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "ボリューム %s の作成に成功しました。"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr "ボリュームはアタッチされたままです。"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr "ボリュームはこのノードのローカルではありません。"
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr "ボリューム %s のエクスポートを解除します。"
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "ボリューム %s を削除します。"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "ボリューム %s の削除に成功しました。"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "snapshotting: インスタンス %s のスナップショットを取得中"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7164,144 +7168,144 @@ msgstr "NotFound 発生: %s"
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "ボリューム %s 用の iSCSI エクスポートが見つかりません"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "ボリューム %s 用の iSCSI エクスポートが見つかりません"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, fuzzy, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, fuzzy, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, fuzzy, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, fuzzy, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr "ip %s に対するメタデータの取得に失敗しました。"
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
 msgstr "Deleting user: ユーザ %s を削除します。"
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7355,36 +7359,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7465,6 +7469,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7486,6 +7493,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "内側で発生した例外： %s"
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7502,6 +7512,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7514,12 +7527,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7568,6 +7608,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7646,6 +7689,58 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr "Rescuing: インスタンス %s をレスキューします。"
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "pausing: インスタンス %s を一時停止します。"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "unpausing: インスタンス %s の一時停止を解除します。"
+
+#~ msgid "instance %s: resuming"
+#~ msgstr "resuming: インスタンス %s をレジュームします。"
+
+#~ msgid "instance %s: locking"
+#~ msgstr "locking: インスタンス %s をロックします。"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "unlocking: インスタンス %s のロックを解除します。"
+
+#~ msgid "instance %s: reset network"
+#~ msgstr "インスタンス %s: ネットワークをリセットします"
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7663,15 +7758,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr "python-migrate がインストールされていません。終了します。"
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7859,6 +8001,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr "フィルタされていないインスタンス %s のフィルタ解除を試行しました"
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr "タスク [%(name)s] %(task)s 状態: 成功    %(result)s"
 
@@ -7873,6 +8021,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr "virsh の出力: %r"
 
@@ -7887,12 +8038,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7931,6 +8091,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr "VM %s を作成します。"
 
@@ -7960,6 +8219,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr "(VM_UTILS) xenserver の vm state -> |%s|"
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr "(VM_UTILS) xenapi の power_state -> |%s|"
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "VDI %s 用に VBD を作成しています… "
 
@@ -8151,6 +8416,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 7ee30c5d9..0baca3ee8 100644
--- a/nova/locale/ko/LC_MESSAGES/nova.po
+++ b/nova/locale/ko/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2011-12-16 04:42+0000\n"
 "Last-Translator: Zhongyue Luo <lzyeval@gmail.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr "플래그 경로: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "명령 실행도중 예측하지 못한 에러가 발생했습니다"
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -85,257 +85,262 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,745 +348,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1105,364 +1147,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr ""
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1471,240 +1514,245 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1745,39 +1793,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1808,31 +1823,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1841,57 +1868,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1986,31 +2013,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2035,216 +2074,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2320,7 +2346,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2413,32 +2438,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2467,23 +2493,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2535,114 +2561,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "인스턴스 %s: 스냅샷 저장중"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2654,261 +2687,272 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2927,495 +2971,470 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executing: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executing |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "인스턴스가 이미 생성되었습니다"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr ""
+#: nova/compute/manager.py:1764
+#, fuzzy, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
-msgstr ""
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
+msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3460,17 +3479,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3479,37 +3498,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3517,104 +3536,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
-msgstr ""
-
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3673,117 +3651,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3791,115 +3774,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3939,54 +3922,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4038,89 +4021,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4148,41 +4131,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4195,59 +4178,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4312,21 +4295,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4371,29 +4354,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4441,12 +4424,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4461,19 +4444,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4496,32 +4478,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4580,21 +4562,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4603,26 +4585,24 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4634,7 +4614,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4659,27 +4639,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4807,99 +4787,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4951,32 +4931,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4995,11 +4975,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5022,182 +5008,182 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5207,42 +5193,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5273,151 +5256,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, python-format
+msgid "Read: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "Writing image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5449,32 +5452,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5556,23 +5559,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5586,225 +5587,199 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5814,76 +5789,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5973,513 +5962,513 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy, python-format
 msgid "Starting instance"
 msgstr "인스턴스 %s를 재부팅합니다"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6523,39 +6512,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6573,88 +6562,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6687,7 +6676,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6700,11 +6689,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6772,101 +6761,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스의 %(sr_ref)s SR에 대한 VDI 생성이 실패했습니다"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스의 %(sr_ref)s SR을 사용 할 수 없습니다"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "%s 인스턴스에 볼륨장착 할 수 없습니다"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 장착되었습니다"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "%s 볼륨 탈착에 실패했습니다"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "%(instance_name)s 인스턴스에 %(mountpoint)s 마운트지점이 탈착되었습니다"
@@ -7003,117 +6992,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "인스턴스 %s: 스냅샷 저장중"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7141,144 +7130,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "%s 볼륨을 찾을수 없습니다"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, python-format
 msgid "Deleting volumeID: %s"
 msgstr ""
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7332,36 +7321,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7442,6 +7431,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7463,6 +7455,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7479,6 +7474,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7491,12 +7489,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7545,6 +7570,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7635,6 +7663,73 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: retrieving diagnostics"
+#~ msgstr ""
+
+#~ msgid "instance %s: suspending"
+#~ msgstr ""
+
+#~ msgid "instance %s: resuming"
+#~ msgstr ""
+
+#~ msgid "instance %s: locking"
+#~ msgstr ""
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting locked state"
+#~ msgstr ""
+
+#~ msgid "instance %s: reset network"
+#~ msgstr ""
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid "Detaching volume from unknown instance %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7652,15 +7747,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7854,6 +7996,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7868,6 +8016,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7882,12 +8033,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7926,6 +8086,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr ""
 
@@ -7964,6 +8223,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8164,6 +8429,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index c51bf347a..f0b06438d 100644
--- a/nova/locale/nova.pot
+++ b/nova/locale/nova.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nova 2012.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23: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"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr ""
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -80,257 +80,262 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -338,745 +343,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1100,364 +1142,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr ""
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1466,240 +1509,245 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1740,39 +1788,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1803,31 +1818,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1836,57 +1863,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1981,31 +2008,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2030,216 +2069,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2315,7 +2341,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2408,32 +2433,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2462,23 +2488,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2530,114 +2556,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2649,261 +2682,272 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2922,493 +2966,467 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1764
 #, python-format
-msgid "Attach failed %(mountpoint)s, removing"
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3453,17 +3471,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3472,37 +3490,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3510,104 +3528,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
-msgstr ""
-
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3666,117 +3643,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3784,115 +3766,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3932,54 +3914,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4031,89 +4013,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4141,41 +4123,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4188,59 +4170,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4305,21 +4287,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4364,29 +4346,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4434,12 +4416,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4454,19 +4436,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4489,32 +4470,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4573,21 +4554,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4596,26 +4577,24 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4627,7 +4606,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4652,27 +4631,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4800,99 +4779,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4944,32 +4923,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4988,11 +4967,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5015,182 +5000,182 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5200,42 +5185,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5266,151 +5248,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, python-format
+msgid "Read: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "Writing image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5442,32 +5444,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5549,23 +5551,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5579,225 +5579,199 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5807,76 +5781,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5966,512 +5954,512 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6515,39 +6503,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6565,88 +6553,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6679,7 +6667,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6692,11 +6680,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6764,101 +6752,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -6993,117 +6981,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7131,144 +7119,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, python-format
 msgid "No LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, python-format
 msgid "Deleting volumeID: %s"
 msgstr ""
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7322,36 +7310,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 5a30caa2a..a177419a6 100644
--- a/nova/locale/pt_BR/LC_MESSAGES/nova.po
+++ b/nova/locale/pt_BR/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
-"PO-Revision-Date: 2012-02-06 21:07+0000\n"
-"Last-Translator: Adriano Steffler <Unknown>\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
+"PO-Revision-Date: 2012-05-04 19:25+0000\n"
+"Last-Translator: Júlio Cezar Santos Pires <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,11 @@ msgstr "Assunto do certificado para projetos, %s para projeto, timestamp"
 msgid "Flags path: %s"
 msgstr "Localização dos sinalizadores: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Erro inesperado ao executar o comando."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -85,258 +85,263 @@ msgstr ""
 "Saída padrão: %(stdout)r\n"
 "Erro: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
-msgid "Failed to decrypt text"
+#: nova/exception.py:159
+msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:179
+msgid "Failed to decrypt text"
+msgstr "Falhou ao descriptografar texto"
+
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
-msgstr ""
+msgstr "Não autorizado."
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
-msgstr ""
+msgstr "Usuário não tem privilégios de administrador"
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
-msgstr "sem método para mensagem: %s"
+msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
-msgstr ""
+msgstr "Parâmetros inaceitáveis."
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
-msgstr ""
+msgstr "A requisição é inválida."
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
-msgstr ""
+msgstr "Dados recebidos é inválido"
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
-msgstr ""
+msgstr "tipo de instância %(instance_type)s é inválida."
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
-msgstr ""
+msgstr "Tipo de volume é inválido"
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
+msgstr "Volume inválido"
+
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
-msgstr ""
+msgstr "Sequencia de porta %(from_port)s:%(to_port)s é inválida. %(msg)s"
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
-msgstr ""
+msgstr "Protocolo IP %(protocol)s é inválido."
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
-msgstr ""
+msgstr "Tipo de conteúdo %(content_type)s é inválido."
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
-msgstr ""
+msgstr "Reutilização inválida de uma conexão RPC."
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
-msgstr ""
+msgstr "%(err)s"
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
-msgstr ""
+msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
-msgstr ""
+msgstr "Falha ao suspender instância"
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
-msgstr ""
+msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 #, fuzzy
 msgid "Failed to terminate instance"
-msgstr "Começando a terminar instâncias"
+msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
+msgstr "Serviço está indisponível neste momento"
 
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
-msgstr ""
+msgstr "%(address)s não é um endereço IPv4/6 válido."
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -344,745 +349,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
-msgstr ""
+msgstr "Formato do disco %(disk_format)s não é aceito"
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
-msgstr ""
+msgstr "Volume %(volume_id)s não pode ser encontrado."
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
-msgstr ""
+msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
-msgstr ""
+msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
-msgstr ""
+msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
-msgstr ""
+msgstr "Usuário %(user_id)s não foi encontrado."
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
-msgstr ""
+msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
-msgstr ""
+msgstr "Usuário %(user_id)s não é um membro do projeto %(project_id)s."
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
-#, python-format
+#: nova/exception.py:534
+#, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
-msgstr ""
+msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
-msgstr ""
+msgstr "%(req)s é necessário para criar a rede."
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
-msgstr ""
+msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
-msgstr ""
+msgstr "Nenhuma rede definida."
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
-msgstr ""
+msgstr "Interface %(interface)s não encontrada."
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
-msgstr ""
+msgstr "Certificado %(certificate_id)s não encontrado."
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
-msgstr ""
+msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
-msgstr ""
+msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
-#, python-format
+#: nova/exception.py:705
+#, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
-msgstr ""
+msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
-#, python-format
+#: nova/exception.py:785
+#, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
-msgstr ""
+msgstr "Usuário %(user_id)s não foi encontrado."
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "Usuário %(uid)s já é um membro do grupo %(group_dn)s"
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
-#, python-format
+#: nova/exception.py:1064
+#, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
-msgstr ""
+msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1095,375 +1137,376 @@ msgstr ""
 #: nova/manager.py:152
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
-msgstr ""
+msgstr "Executando tarefa periódica %(full_task_name)s"
 
 #: nova/manager.py:159
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
-msgstr ""
+msgstr "Erro durante %(full_task_name)s: %(e)s"
 
 #: nova/manager.py:203
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr "Encerrado serviço que não tem entrada na base de dados"
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "O objeto da base de dados do serviço desapareceu, Recriando."
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr "Recuperada conexão servidor de modelo."
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr "servidor de modelo perdido"
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "Conjunto completo de FLAGS:"
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "Exceção interna: %s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "Buscando %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Executando comando (subprocesso): %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "Resultado foi %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
-msgstr ""
+msgstr "%r falhou. Tentando novamente."
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Executando o comando (SSH): %s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
-msgstr ""
+msgstr "Ambiente não suportado por SSH"
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "depuração em retorno de chamada: %s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "Endereço para Link Local não encontrado: %s"
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "Não foi possível atribuir um IP para o Link Local de %(interface)s :%(ex)s"
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Backend inválido: %s"
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr "backend %s"
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
-msgstr ""
+msgstr "Objeto esperado do tipo: %s"
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
-msgstr ""
+msgstr "Classe %(fullname)s está obsoleta: %(msg)s"
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr "Muitas falhas de autenticação."
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Falha de Autenticação: %s"
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr "ação: %s"
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "NotFound lançado: %s"
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "Ocorreu um erro desconhecido. Por favor tente sua requisição novamente."
 
@@ -1472,241 +1515,246 @@ msgstr "Ocorreu um erro desconhecido. Por favor tente sua requisição novamente
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr "Criar par de chaves %s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Remover par de chaves %s"
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr "Não existe regra para os parâmetros especificados"
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regra já existe no grupo %s"
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Criar Grupo de Segurança %s"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr "group %s já existe"
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Criar volume de %s GB"
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo não suportado: %s"
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr "Alocar endereço"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar endereço %s"
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr "Começando a terminar instâncias"
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instância %r"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr "usuário ou grupo não especificado"
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr "apenas o grupo \"all\" é suportado"
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr "operation_type deve ser add ou remove"
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Atualizando publicidade da imagem %s"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1747,39 +1795,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1810,31 +1825,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1843,57 +1870,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1951,7 +1978,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/console_output.py:52
 msgid "Malformed request body"
-msgstr ""
+msgstr "Corpo do pedido está mal formado"
 
 #: nova/api/openstack/wsgi.py:829
 msgid "Unsupported Content-Type"
@@ -1988,37 +2015,49 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, fuzzy, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr "Assinatura inválida para usuário %s"
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
-msgstr ""
+msgstr "Imagem não encontrada."
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
-msgstr ""
+msgstr "Corpo do pedido e incompatibilidade URI"
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
-msgstr ""
+msgstr "Corpo da solicitação contém muitos intens"
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
 #: nova/api/openstack/compute/ips.py:74
 msgid "Instance does not exist"
-msgstr ""
+msgstr "Instância não existe"
 
 #: nova/api/openstack/compute/ips.py:97
 msgid "Instance is not a member of specified network"
@@ -2033,220 +2072,208 @@ msgstr ""
 
 #: nova/api/openstack/compute/limits.py:266
 msgid "This request was rate-limited."
-msgstr ""
+msgstr "Este pedido estava com taxa limitada."
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+#, fuzzy, python-format
+msgid "HostId cannot be updated."
+msgstr "Ponto de montagem não pode ser traduzido: %s"
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2322,11 +2349,10 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
-msgstr ""
+msgstr "Instância não encontrada"
 
 #: nova/api/openstack/compute/contrib/admin_actions.py:272
 msgid "host and block_migration must be specified."
@@ -2411,36 +2437,38 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextradata.py:61
 #: nova/api/openstack/compute/contrib/flavorextradata.py:91
+#, fuzzy
 msgid "Flavor not found."
-msgstr ""
+msgstr "Imagem não encontrada."
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
-msgstr ""
+msgstr "Endereço não especificado"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2469,23 +2497,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2522,12 +2550,12 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/networks.py:90
 #, python-format
 msgid "Showing network with id %s"
-msgstr ""
+msgstr "Mostrando rede com id %s"
 
 #: nova/api/openstack/compute/contrib/networks.py:100
 #, python-format
 msgid "Deleting network with id %s"
-msgstr ""
+msgstr "Removendo rede com id %s"
 
 #: nova/api/openstack/compute/contrib/quotas.py:59
 msgid "Quota limit must be -1 or greater."
@@ -2537,115 +2565,124 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 #, fuzzy, python-format
 msgid "Security group is still in use"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr "Esta regra já existe no grupo %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#, fuzzy, python-format
+msgid "start instance"
+msgstr "Iniciando instância %s"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+#, fuzzy, python-format
+msgid "stop instance"
+msgstr "Reiniciar instância %r"
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
-msgstr ""
+msgstr "vol=%s"
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
-msgstr ""
+msgstr "Remover volume com id: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "Instância %s não encontrada"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr "Tentativa de instanciar singleton"
@@ -2659,265 +2696,277 @@ msgstr ""
 "Tentatica de remover o último membto de um grupo. Ao invés disso "
 "excluindo o grupo %s."
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Procurando usuário: %r"
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Falha de autorização para chave de acesso %s"
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "Usando nome do projeto = nome do usuário (%s)"
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Assinatura inválida para usuário %s"
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr "Deve especificar projeto"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr "modificando projeto %s"
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Adicionando usuário %(uid)s ao projeto %(pid)s"
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Remover usuário %(uid)s do projeto %(pid)s"
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr "Excluindo projeto %s"
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr "Apagando usuário %s"
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
-msgstr "Obter saída do console para instância %s"
+msgstr "tipo de instância %(instance_type)s é inválida."
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Executando VPN para %s"
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
+#, fuzzy
 msgid "Going to try to stop instance"
-msgstr ""
+msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2936,496 +2985,478 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: locked: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: executando: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock: not executando |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
-msgstr ""
+msgstr "Não foi possível carregar o driver de virtualização: %s"
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
-#, fuzzy, python-format
+#: nova/compute/manager.py:445
+#, fuzzy
 msgid "Instance not found."
-msgstr "instância %s: suspendendo"
+msgstr "Instância não encontrada"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "A instância já foi criada"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
-msgstr "O VBD não foi encontrado na instância %s"
+msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
-msgstr "Reiniciando a instância %s"
+msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Reiniciando a instância %s"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
-msgstr ""
+msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
-#, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
-msgstr ""
+#: nova/compute/manager.py:1128
+#, fuzzy, python-format
+msgid "updating agent to %(url)s"
+msgstr "Atualizando agente para %s"
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
-msgstr "instância %s: resgatando"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
+msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+#, fuzzy, python-format
+msgid "Unrescuing"
 msgstr "instância %s: desfazendo o resgate"
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "instância %s: pausando"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
+msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "instância %s: saindo do pause"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "instância %s: recuperando os diagnósticos"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "instância %s: suspendendo"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "instância %s: resumindo"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "instância %s: bloqueando"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "instância %s: desbloqueando"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+#, fuzzy, python-format
+msgid "Getting locked state"
 msgstr "instância %s: obtendo estado de bloqueio"
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+#, fuzzy, python-format
+msgid "Reset network"
 msgstr "instância %s: reset da rede"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
-msgstr ""
+#: nova/compute/manager.py:1672
+#, fuzzy, python-format
+msgid "Get console output"
+msgstr "Obter saída do console para instância %s"
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
-msgstr ""
+#: nova/compute/manager.py:1699
+#, fuzzy
+msgid "Getting vnc console"
+msgstr "Adicionando console"
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr ""
+#: nova/compute/manager.py:1764
+#, fuzzy, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
 msgstr "Desconectando volume da instância desconhecida %s"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr "Adicionando console"
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3470,17 +3501,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3489,37 +3520,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3527,104 +3558,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
-msgstr ""
-
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3683,117 +3673,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d está ultrapassado, reiniciando dnsmasq"
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d está ultrapassado, reiniciando radvd"
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Iniciando a VLAN %s"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Iniciando a Bridge para %s"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, fuzzy, python-format
+msgid "Failed to add interface: %s"
+msgstr "Falha ao suspender instância"
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
-msgstr "Iniciando a Bridge para %s"
+msgstr "Iniciando instância %s"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
-#, python-format
+#: nova/network/manager.py:292
+#, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
-msgstr ""
+msgstr "Certificado %(certificate_id)s não encontrado."
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
-msgstr ""
+msgstr "Endereço |%(address)s| não está alocado"
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3801,115 +3796,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
-msgstr ""
+msgstr "Rede já existe!"
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3949,54 +3944,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4048,89 +4043,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr "conteúdo descompactado: %s"
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "recebido %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "sem método para mensagem: %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "Sem método para mensagem: %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID é %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Retornando exceção %s ao método de origem"
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4158,41 +4153,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4205,59 +4200,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4322,22 +4317,22 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
-#, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
-msgstr ""
+#: nova/scheduler/manager.py:160
+#, fuzzy, python-format
+msgid "Setting instance to %(state)s state."
+msgstr "Iniciando instância %s"
 
 #: nova/scheduler/scheduler_options.py:66
 #, python-format
@@ -4381,29 +4376,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
-msgstr ""
+msgstr "Erro interno"
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4451,12 +4446,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4471,67 +4466,66 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
 #, python-format
 msgid "_create: %s"
-msgstr ""
+msgstr "_criar: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:66
 #, python-format
 msgid "_delete: %s"
-msgstr ""
+msgstr "_remover: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:75
 #, python-format
 msgid "_get: %s"
-msgstr ""
+msgstr "_obter: %s"
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:85
 #, python-format
 msgid "_get_all: %s"
-msgstr ""
+msgstr "_obter_todos: %s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4590,21 +4584,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4613,27 +4607,26 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr "Falha ao abrir a conexão com o hypervisor"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
-msgstr ""
+#, fuzzy
+msgid "Filters added to instance"
+msgstr "Falhou ao reiniciar instância"
 
 #: nova/virt/firewall.py:139
 msgid "Provider Firewall Rules refreshed"
@@ -4644,7 +4637,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4669,27 +4662,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4817,99 +4810,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4961,32 +4954,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
-msgstr ""
+msgstr "Falhou em montar sistema de arquivo: %s"
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5005,11 +4998,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:78
+#, fuzzy, python-format
+msgid "partition %s not found"
+msgstr "nenhuma partição encontrada"
+
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5032,183 +5031,185 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: criado com sucesso"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
+#, fuzzy
 msgid "Failed to soft reboot instance."
-msgstr ""
+msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
+#, fuzzy
 msgid "Guest does not have a console available"
-msgstr ""
+msgstr "Usuário não tem privilégios de administrador"
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5218,42 +5219,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5284,151 +5282,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr "Impossível localizar uma porta aberta"
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "_criar: %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "Iniciando a Bridge para %s"
+
+#: nova/virt/libvirt/utils.py:395
+#, fuzzy, python-format
+msgid "Wrote: %s"
+msgstr "_criar: %s"
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5460,32 +5478,32 @@ msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
-msgstr ""
+msgstr "Sessão inválida"
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5567,23 +5585,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5597,225 +5613,202 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:333
+#, fuzzy
+msgid "Powering on the VM instance"
+msgstr "Começando a terminar instâncias"
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy
+msgid "instance not present"
+msgstr "Instância não existe"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:582
+#, fuzzy, python-format
+msgid "Unregistering the VM"
+msgstr "Removendo o registro da imagem %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5825,76 +5818,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
-msgstr ""
+msgstr "Obtendo o tamanho da imagem para a imagem %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr "Aumento não implementado"
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake não tem uma implementação para %s"
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Chamando %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "Chamando o pai %s"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5986,56 +5993,57 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
+#, fuzzy, python-format
 msgid "Created VM"
-msgstr ""
+msgstr "_criar: %s"
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "O VBD não foi encontrado na instância %s"
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "group %s já existe"
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Não é possível desconectar o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "VBD %(vbd_ref)s criado para VM %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6044,459 +6052,461 @@ msgstr ""
 "VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) no SR "
 "%(sr_ref)s criada com sucesso."
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, fuzzy, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr "Fazendo um snapshot da VM %(vm_ref)s com rótulo '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, fuzzy, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Snapshot %(template_vm_ref)s criado a partir da VM %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 "Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
 "%(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "Tamanho da imagem %(image)s:%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Copiando o VDI %s de /boot/guest no dom0"
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Kernel/Ramdisk %s destruidos"
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
+#, fuzzy
 msgid "Failed to fetch glance image"
-msgstr ""
+msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Verificando o vdi %s para kernel PV"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr "O VDI %s continua disponível"
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr "(VM_UTILS) xenserver vm state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr "(VM_UTILS) xenapi power_state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Re-escaneando SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "O VHD %(vdi_uuid)s tem pai %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Conectando VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "O VDB %s foi conectado."
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Destruindo VBD para o VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "O VBD para o VDI %s foi destruído."
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "Rodando pygrub novamente %s"
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Kernel Xen encontrado: %s"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Kernel Xen não encontrado. Iniciando como HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
-#, python-format
-msgid "Updating progress to %(progress)d"
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
+#, fuzzy, python-format
+msgid "Updating progress to %(progress)d"
+msgstr "Atualizando agente para %s"
+
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy, python-format
 msgid "Starting instance"
-msgstr "Reiniciando a instância %s"
+msgstr "Iniciando instância %s"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
+#, fuzzy
 msgid "Failed to spawn, rolling back"
-msgstr ""
+msgstr "Falha ao suspender instância"
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
-msgstr ""
+msgstr "Atualizando agente para %s"
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
-msgstr ""
+msgstr "Configurar senha do administrador"
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "Não é possível anexar o volume na instância %s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6533,46 +6543,46 @@ msgstr ""
 #: nova/virt/xenapi/vmops.py:962
 #, python-format
 msgid "Failed to update password: %(resp)r"
-msgstr ""
+msgstr "Falhou em atualizar senha: %(resp)r"
 
 #: nova/virt/xenapi/vmops.py:987
 #, python-format
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6590,88 +6600,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
-#, python-format
+#: nova/virt/xenapi/vmops.py:1343
+#, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
-msgstr ""
+msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Criando a VIF para VM %(vm_ref)s, rede %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erro de OpenSSL: %s"
@@ -6688,7 +6698,7 @@ msgstr ""
 #: nova/virt/xenapi/volume_utils.py:58 nova/virt/xenapi/volume_utils.py:86
 #, python-format
 msgid "name = %s"
-msgstr ""
+msgstr "nome = %s"
 
 #: nova/virt/xenapi/volume_utils.py:71
 #, python-format
@@ -6704,7 +6714,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6717,11 +6727,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6789,103 +6799,103 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Ponto de montagem não pode ser traduzido: %s"
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 "Não é possível criar o VDI no SR %(sr_ref)s para a instância "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Não é possível usar o SR %(sr_ref)s para a instância %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Não é possível anexar o volume na instância %s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s conectada à instância %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Não é possível desconectar o volume %s"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Ponto de montagem %(mountpoint)s desanexada da instância %(instance_name)s"
@@ -7022,117 +7032,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Re-exportando %s volumes"
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "volume %s: ignorando export"
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "volume %s: criando"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr "volume %(vol_name)s: criando lv com tamanho %(vol_size)sG"
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "volume %s: criando o export"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "volume %s: criado com sucesso"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr "O volume continua atachado"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr "O volume não pertence à este node"
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr "volume %s: removendo export"
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "volume %s: removendo"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "volume %s: remoção realizada com sucesso"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7161,144 +7171,144 @@ msgstr "NotFound lançado: %s"
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, fuzzy, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, fuzzy, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, fuzzy, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, fuzzy, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
-msgstr "Apagando usuário %s"
+msgstr "Remover volume com id: %s"
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7352,36 +7362,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
-msgstr ""
+msgstr "Falha ao iniciar sessão"
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
-msgstr ""
+msgstr "Não foi possível criar volume"
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7462,6 +7472,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7483,6 +7496,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "Exceção interna: %s"
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7499,6 +7515,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7511,12 +7530,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7565,6 +7611,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7621,9 +7670,6 @@ msgstr ""
 #~ msgid "exception terminating the instance %(instance_uuid)s"
 #~ msgstr ""
 
-#~ msgid "Instance %s not found."
-#~ msgstr ""
-
 #~ msgid "trying to destroy already destroyed instance: %s"
 #~ msgstr "tentando destruir instância já destruida: %s"
 
@@ -7636,9 +7682,6 @@ msgstr ""
 #~ msgid "Cannot rebuild instance [%(instance_uuid)s]: %(exc)s"
 #~ msgstr ""
 
-#~ msgid "Rebuilding instance %s"
-#~ msgstr ""
-
 #~ msgid ""
 #~ "trying to reboot a non-running "
 #~ "instance: %(instance_uuid)s (state: %(state)s "
@@ -7655,6 +7698,55 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr "instância %s: resgatando"
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "instância %s: pausando"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "instância %s: saindo do pause"
+
+#~ msgid "instance %s: resuming"
+#~ msgstr "instância %s: resumindo"
+
+#~ msgid "instance %s: locking"
+#~ msgstr "instância %s: bloqueando"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "instância %s: desbloqueando"
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7672,15 +7764,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7845,7 +7984,7 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid "Host %s"
-#~ msgstr ""
+#~ msgstr "Host %s"
 
 #~ msgid "Test: provision vol %(name)s on host %(host)s"
 #~ msgstr ""
@@ -7857,7 +7996,7 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid "Test: Volume create: %s"
-#~ msgstr ""
+#~ msgstr "Teste: Criar volume: %s"
 
 #~ msgid "Test: Volume get request: id=%(volume_id)s"
 #~ msgstr ""
@@ -7868,6 +8007,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7896,12 +8041,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7940,6 +8094,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr "VM %s criada..."
 
@@ -7969,6 +8222,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr "(VM_UTILS) xenserver vm state -> |%s|"
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr "(VM_UTILS) xenapi power_state -> |%s|"
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Criando VBD para VDI %s ... "
 
@@ -7996,9 +8255,6 @@ msgstr ""
 #~ msgid "Attempted to power on non-existent instance bad instance id %s"
 #~ msgstr ""
 
-#~ msgid "Starting instance %s"
-#~ msgstr ""
-
 #~ msgid "instance %s: Failed to spawn"
 #~ msgstr "instância %s: falha na geração"
 
@@ -8166,6 +8422,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 2ff792825..d7b260200 100644
--- a/nova/locale/ru/LC_MESSAGES/nova.po
+++ b/nova/locale/ru/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2012-03-25 09:34+0000\n"
 "Last-Translator: Eugene Marshal <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -69,11 +69,11 @@ msgstr "Тема для сертификатов проектов, %s для п�
 msgid "Flags path: %s"
 msgstr "Расположение флагов: %s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Неожиданная ошибка при выполнении команды."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -88,155 +88,164 @@ msgstr ""
 "Stdout: %(stdout)r\n"
 "Stderr: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr "Обнаружено неизвестное исключение."
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr "Ошибка дешифровки текста"
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr "Ошибка создания виртуального интерфейса"
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 "5 безуспешных попыток создания виртуального интерфейса с уникальным "
 "mac-адресом"
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr "Сбой соединения с glance"
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr "Сбой соединения c melange"
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr "Не авторизировано."
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr "Пользователь не имеет административных привилегий"
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Политика не допускает выполнения %(action)s."
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Ядро не найдено для образа %(image_id)s."
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr "Недопустимые параметры."
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr "Недопустимый снимок"
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Том %(volume_id)s никуда не присоединён"
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr "Ошибка загрузки данных в формат json"
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr "Недопустимый запрос."
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr "Недопустимая подпись %(signature)s для пользователя %(user)s."
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr "Недопустимый тип копии %(instance_type)s."
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr "Недопустимый тип тома"
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr "Недопустимый том"
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr "Недопустимые метаданные"
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Недопустимый диапазон портов %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Недопустимый протокол IP %(protocol)s."
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Недопустимый тип содержимого %(content_type)s."
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Недопустимый cidr %(cidr)s."
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -245,72 +254,68 @@ msgstr ""
 "Копия %(instance_uuid)s в %(attr)s %(state)s. Невозможно %(method)s во "
 "время нахождения копии в этом состоянии."
 
-#: nova/exception.py:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Копия %(instance_id)s не выполняется."
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "Копия %(instance_id)s не переведена в режим приостановления."
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Копия %(instance_id)s не переведена в режим восстановления"
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr "Ошибка приостановления копии"
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr "Ошибка возобновления работы сервера"
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr "В данный момент служба недоступна."
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr "Служба томов в данный момент недоступна."
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr "Служба Compute недоступна в настоящее время."
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "Невозможно переместить копию (%(instance_id)s) на текущий узел (%(host)s)."
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr "Назначенный узел compute недоступен в настоящее время."
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr "Исходный узел compute недоступен в настоящее время."
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Копии необходима новая версия гипервизора, вместо предоставленной."
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -319,33 +324,33 @@ msgstr ""
 "Предоставленный адрес диска (%(path)s) уже существует, но ожидалось, что "
 "отсутствует."
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Недопустимое размещение предоставленного устройства (%(path)s)."
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr "Недопустимые сведения ЦПУ"
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s не является допустимым IP-адресом в4/6."
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -353,70 +358,74 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Форматирование диска %(disk_format)s недопустимо"
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Образ %(image_id)s недопустим: %(reason)s"
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Копия %(instance_id)s недопустима: %(reason)s"
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s недопустим."
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr "Ресурс не может быть найден."
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr "Необходимый флаг %(flag)s не назначен."
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "Не найден том для копии %(instance_id)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "Том %(volume_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "Тип тома %(volume_type_id)s не может быть найден."
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "Тип тома под названием %(volume_type_name)s не может быть найден."
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
@@ -425,121 +434,121 @@ msgstr ""
 "Тип тома %(volume_type_id)s не имеет дополнительных особенностей с ключом"
 " %(extra_specs_key)s."
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "удаление тома %(volume_name)s, который имеет снимок"
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Отсутствует диск в %(location)s"
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Невозможно найти обработчик для тома %(driver_type)s."
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Недопустимый образ href %(image_href)s."
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "Ядро не найдено для образа %(image_id)s."
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr "Пользователь %(user_id)s не найден."
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr "Пользователь %(user_id)s не является участником проекта %(project_id)s."
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr "Полномочия %(role_id)s не могут быть найдены."
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr "Невозможно найти SR для чтения/записи VDI."
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s необходимо для создания сети."
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Сеть не может быть найдена для моста %(bridge)s"
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Сеть не может быть найдена для uuid %(uuid)s"
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Сеть не найдена с cidr %(cidr)s."
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Сеть не найдена для копии %(instance_id)s."
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr "Сети не определены."
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -548,190 +557,190 @@ msgstr ""
 "Или uuid %(network_uuid)s сети не предоставлено или не присвоено проекту "
 "%(project_id)s."
 
-#: nova/exception.py:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "Узел не назначен сети (%(network_id)s)."
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Недопустимый фиксированный IP-адрес %(address)s."
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "Запись DNS %(name)s уже существует в домене %(domain)s."
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Интерфейс %(interface)s не найден."
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "Сертификат %(certificate_id)s не найден."
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Узел %(host)s не найден."
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Узел сompute %(host)s не найден."
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr "Ключ доступа %(access_key)s не найден."
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr "Квота не найдена"
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Группа безопасности %(security_group_id)s не найдена."
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "Группа безопасности %(security_group_id)s не найдена для проекта "
 "%(project_id)s."
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Группа безопасности с правилом %(rule_id)s не найдена."
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -740,7 +749,7 @@ msgstr ""
 "Группа безопасности %(security_group_id)s уже ассоциирована с копией "
 "%(instance_id)s"
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -749,363 +758,396 @@ msgstr ""
 "Группа безопасности %(security_group_id)s не ассоциирована с копией "
 "%(instance_id)s"
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Перемещение %(migration_id)s не найдено."
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Перемещение не найдено для копии %(instance_id)s в состоянии %(status)s."
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Пул консоли %(pool_id)s не найден."
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Консоль %(console_id)s не найдена."
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr "Консоль для копии %(instance_id)s не найдена."
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr "Консоль для копии %(instance_id)s в пуле %(pool_id)s не найдена."
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "Недопустимый тип консоли %(console_type)s "
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Тип копии с названием %(instance_type_name)s не найден."
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr "Зона %(zone_id)s не найдена."
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr "Копия %(instance_id)s не имеет метаданных с ключом %(metadata_key)s."
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, fuzzy, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr "Копия %(instance_id)s не имеет метаданных с ключом %(metadata_key)s."
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr "Объект LDAP не найден"
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr "Пользователь LDAP %(user_id)s не найден."
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr "Группа LDAP %(group_id)s не найдена."
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr "Пользователь LDAP %(user_id)s не является участником группы %(group_id)s."
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Файл %(file_path)s не может быть найден."
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 "Не найден виртуальный переключатель ассоциированный с сетевым адаптером "
 "%(adapter)s."
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Сетевой адаптер %(adapter)s не может быть найден."
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Класс %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr "Действие не разрешено."
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr "Невозможно использовать глобальные полномочия %(role_id)s"
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr "Пользователь %(user)s уже существует."
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr "Пользователь LDAP %(user)s уже существует."
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr "Группа LDAP %(group)s уже существует."
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "Пользователь %(uid)s уже является участником группы %(group_dn)s"
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr "Проект %(project)s уже существует."
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Копия %(name)s уже существует."
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr "Тип копии %(name)s уже существует."
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "Тип тома %(name)s уже существует."
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr "%(path)s располагается на общедоступном накопителе: %(reason)s"
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr "Ошибка перемещения"
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Неправильное тело сообщения: %(reason)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr "При изменении размера, копии должны изменить размер!"
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr "Образ больше, чем допустимо для этого типа копии"
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr "1-а или несколько зон не могут завершить запрос"
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Недостаточно памяти на узле сети compute для запуска %(uuid)s."
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Допустимый узел не найден. %(reason)s"
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "Узел %(host)s не работает или не существует."
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr "Превышена квота"
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, fuzzy, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, fuzzy, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr "Выбрано макс. количество узлов (%d)"
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 "Невозможно создать volume_type с именем %(name)s и спецификациями "
 "%(extra_specs)s"
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Копия %(instance_id)s не найдена."
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1131,366 +1173,367 @@ msgstr "Ошибка во время %(full_task_name)s: %(e)s"
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "Запуск узла сети (версия %(vcs_string)s) %(topic)s"
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr "Служба завершила работу из-за отсутствия записи базы данных"
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "Объект сервиса в базе данных отсутствует, Повторное создание."
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "Полный набор ФЛАГОВ:"
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "Вложенное исключение: %s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "Получение %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "Приняты неизвестные аргументы ключевого слова для utils.execute: %r"
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "Выполнение команды (субпроцесс): %s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "Результат %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r ошибка. Выполняется повтор."
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "Выполнение команды (SSH): %s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr "Среда не поддерживается с использованием SSH"
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr "process_input не поддерживается с использованием SSH"
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "отладка в обратном вызове: %s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "Недопустимый внутренний интерфейс: %s"
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr "внутренний интерфейс %s"
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "Ожидался объект типа: %s"
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "Недопустимая server_string: %s"
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc: '%(name)s' заняла %(total_time).2f с."
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
-msgstr "Исходное исключение было сброшено"
+#: nova/utils.py:1318
+#, fuzzy, python-format
+msgid "Reloading cached file %s"
+msgstr "Выгрузка образа %s"
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "Класс %(fullname)s устарел: %(msg)s"
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "Класс %(fullname)s устарел"
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr "Функция %(name)s в %(location)s устарела: %(msg)s"
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "Функция %(name)s в %(location)s устарела"
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "Ошибка удаления контейнера: %s"
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr "Выполняется %(name)s на %(host)s:%(port)s"
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr "Выполняется останов сервера WSGI."
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr "Сервер WSGI был остановлен."
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr "Слишком много неудачных попыток аутентификации."
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "Ошибка аутентификации: %s"
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "Запрос аутентификации для %(uname)s:%(pname)s)"
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr "действие: %s"
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 "Неавторизированный запрос для контроллера=%(controller)s и "
 "действия=%(action)s"
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 "Произошла неизвестная ошибка. Пожалуйста, попытайтесь повторить ваш "
@@ -1503,12 +1546,17 @@ msgstr ""
 "Неподдерживаемый запрос API: контроллер = %(controller)s, действие = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Создать снимок тома %s"
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, fuzzy, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
@@ -1517,71 +1565,71 @@ msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Содержание ограничено "
 "буквенно-цифровыми символами, пробелами, тире и подчёркиваниями."
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, fuzzy, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Длина превышает "
 "максимально допустимое значение 255."
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr "Создание пары ключей %s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr "Импортировать ключ %s"
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Удаление пары ключей %s"
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 #, fuzzy, python-format
 msgid "Invalid CIDR"
 msgstr "Недопустимый cidr %(cidr)s."
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Недостаточно параметров для сбора правильного правила."
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr "Отсутствует правило для заданных параметров."
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Это правило уже существует в группе %s"
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 #, fuzzy, python-format
 msgid "Quota exceeded, too many security group rules."
 msgstr "Добавление правила группы безопасности: %r"
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
@@ -1590,7 +1638,7 @@ msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Содержание ограничено "
 "буквенно-цифровыми символами, пробелами, тире и подчёркиваниями."
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
@@ -1599,157 +1647,157 @@ msgstr ""
 "Значение (%s) для параметра GroupName недопустимо. Длина превышает "
 "максимально допустимое значение 255."
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Создать группу безопасности %s"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr "группа %s уже существует"
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Удалить группу безопасности %s"
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Получить консольный вывод для копии %s"
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Создать том из снимка %s"
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Создание раздела %s ГБ"
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Ошибка создания"
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Подключить том %(volume_id)s для копии %(instance_id)s на %(device)s"
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 #, fuzzy
 msgid "Attach Failed."
 msgstr "Ошибка создания"
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr "Отсоединить том %s"
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Отсоединить том %s"
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "аттрибут не поддерживается: %s"
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr "Выделить адрес"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr "Присвоить адрес %s"
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Присвоить адрес %(public_ip)s копии %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Исключить адрес %s"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr "Образ должен быть доступен"
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr "Выполнение завершения работы копий"
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Перезагрузить копию %r"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr "Выполнение остановки копий"
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr "Выполнение запуска копий"
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr "Исключение регистрации образа %s"
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Зарегистрированный образ %(image_location)s с идентификатором %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr "не указан пользователь или группа"
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr "поддерживается только группа \"все(all)\""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Обновление осведомлённости об образе %s"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Невозможно остановить копию в течении %d с."
@@ -1792,39 +1840,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "Расширение %(ext_name)s расширение ресурса: %(collection)s"
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr "%(user_id)s не может быть найден с токеном '%(token)s'"
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr "%(user_id)s должен быть администратором или участником %(project_id)s"
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr "В запросе невозможно найти %s."
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr "Аутентификация '%s' выполнена"
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr "Не найден пользователь с предоставленным API ключом."
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr "Предоставленный ключ API допустим, но не для пользователя '%(username)s'"
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1855,31 +1870,44 @@ msgstr "href %s не содержит версию"
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+#, fuzzy
+msgid "Invalid image metadata"
+msgstr "Недопустимые метаданные"
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, fuzzy, python-format
 msgid "Converted networks: %s"
 msgstr "Непредвиденная ошибка: %s"
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Невозможно '%(action)s', когда копия в %(attr)s %(state)s"
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr "Копия в недопустимом состоянии для '%(action)s'"
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Отклонение запроса снимка, снимки в данный момент отключены"
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Снимки копии в настоящий момент недопустимы."
 
@@ -1888,57 +1916,57 @@ msgstr "Снимки копии в настоящий момент недопу�
 msgid "Loaded extension: %s"
 msgstr "Загруженное расширение: %s"
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr "Загрузка расширения %s"
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Ошибка загрузки расширения %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr "Ошибка загрузки расширения %(ext_name)s: %(exc)s"
@@ -2033,31 +2061,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr "Инициализация диспетчера расширений."
 
+#: nova/api/openstack/compute/flavors.py:101
+#, fuzzy, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr "Не допустимая подпись для пользователя %s"
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr "образ не найден."
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr "Неправильный формат тела запроса"
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr "Тело запроса и URI не совпадают"
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr "Тело запроса содержит избыточное количество объектов"
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr "Неправильный ключ метаданных"
 
@@ -2084,216 +2124,204 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr "Сервер не существует"
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr "Элемент метаданных не найден"
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr "Недопустимое состояние сервера: %(status)s"
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr "Имя сервера является пустой строкой"
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "Недопустимый сетевой формат: сетевой uuid имеет неправильный формат (%s)"
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "Недопустимый фиксированный IP-адрес (%s)"
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "Дубликаты сетей (%s) не разрешены"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "Недопустимый сетевой формат: отсутствует %s"
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr "Недопустимый сетевой формат"
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr "Содержимое данных пользователя не может быть дешифровано"
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr "Имя сервера не задано"
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr "Предоставлен недопустимый flavorRef."
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr "Невозможно найти запрошенный образ"
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr "Предоставлен недопустимый key_name."
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+#, fuzzy, python-format
+msgid "HostId cannot be updated."
+msgstr "Точка подключения не может быть переведена: %s"
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr "С копией не производилось изменение размера."
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr "Отсутствует аргумент типа 'type' для перезагрузки"
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr "Ошибка при перезагрузке %s"
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr "Изменение размера требует изменения объёма."
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr "Неправильный объект сервера"
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr "Отсутствует атрибут imageRef"
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr "Отсутствует атрибут flavorRef"
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr "adminPass не был задан"
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr "Недопустимый adminPass"
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "Запрос изменения размера имеет недопустимый атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "Запросы изменение размера требуют атрибут 'flavorRef'."
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr "Недопустимый запрос тела"
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr "Копия не найдена"
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr "Недопустимые метаданные"
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "Удаление параметров '%(unk_opt_str)s' из запроса"
@@ -2369,7 +2397,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2465,32 +2492,33 @@ msgid "Flavor not found."
 msgstr "Сервер не найден."
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr "Нет тела запроса"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr "Адрес не задан"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2519,23 +2547,23 @@ msgstr "Перевод узла %(host)s в %(state)s."
 msgid "Setting host %(host)s to %(state)s."
 msgstr "Перевод узла %(host)s в %(state)s."
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr "Узел не найден"
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2587,115 +2615,124 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 #, fuzzy, python-format
 msgid "Security group is still in use"
 msgstr "Группа безопасности (%s) не найдена"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Группа безопасности %s уже существует"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Группа безопасности %s не может быть пустой."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr "Группа безопасности (%s) не найдена"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr "Недостаточно параметров для сбора правильного правила."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr "Это правило уже существует в группе %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Правило (%s) не найдено"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr "Группа безопасности не задана"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr "Наименование группы безопасности не может отсутствовать"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#, fuzzy, python-format
+msgid "start instance"
+msgstr "Запуск копии %s"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
-msgstr ""
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+#, fuzzy
+msgid "stop instance"
+msgstr "Выполнение остановки копий"
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr "vol=%s"
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr "Удалить том с идентификатором: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr "Присоединить том %(volume_id)s к копии %(server_id)s на %(device)s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "Копия %s не найдена."
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr "Удалить снимок с идентификатором: %s"
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr "Создать снимок из тома %s"
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2709,27 +2746,27 @@ msgstr ""
 "Попытка удаление последнего участника группы. Будет выполнено удаление "
 "группы в %s."
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr "Поиск пользователя: %r"
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "Ошибка авторизации для ключа доступа %s"
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr "ошибка авторизации: нет проекта под названием %(pjid)s (user=%(uname)s)"
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
@@ -2738,159 +2775,163 @@ msgstr ""
 "Ошибка авторизации: пользователь %(uname)s не является администратором и "
 "не является участником проекта %(pjname)s"
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr "подпись: %s"
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "Не допустимая подпись для пользователя %s"
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr "Необходимо указать проект"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "Добавление полномочий %(role)s для пользователя %(uid)s в проекте %(pid)s"
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr "Удаление полномочий %(role)s для пользователя %(uid)s в проекте %(pid)s"
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "Созданный проект %(name)s с диспетчером %(manager_user)s"
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr "изменение проекта %s"
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "Добавление пользователя %(uid)s в проект %(pid)s"
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "Исключить пользователя %(uid)s из проекта %(pid)s"
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr "Удаление проекта %s"
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "Созданный пользователь %(rvname)s (admin: %(rvadmin)r)"
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr "Удаление пользователя %s"
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "Режим администратора назначен %(admin)r для пользователя %(uid)s"
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "Нет vpn данных для проекта %s"
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
 msgstr "Недопустимый тип копии %(instance_type)s."
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "Запуск VPN для %s"
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "Невозможно найти узел для копии %s"
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Превышена квота копий. Вы не можете запустить дополнительные копии этого "
 "типа."
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Превышена квота копий. Вы можете запустить только %s копий этого типа."
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr "Превышена квота для %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -2899,79 +2940,84 @@ msgstr ""
 "Превышена квота для %(pid)s, попытка назначить %(num_metadata)s свойств "
 "метаданных"
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
 msgstr ""
-"Превышена квота для %(pid)s, превышено ключевое свойство метаданных или "
-"значение"
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Выполняет запуск %s копий..."
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr "Отправка операции создания в расписание для %(pid)s/%(uid)s's"
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Выполнение запуска копий"
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 #, fuzzy, python-format
 msgid "No host for instance, deleting immediately"
 msgstr "Отсутствует узел для копии %s, немедленное удаление"
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "Будет выполнения попытка завершить работу %s"
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "Попытка остановить %s"
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "Попытка запустить %s"
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr "Копия %(instance_uuid)s не остановлена. (%(vm_state)s"
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "Поиск по: %s"
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "Тип образа не распознан %s"
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -2980,7 +3026,7 @@ msgstr ""
 "Устаревший тип копии %(current_instance_type_name)s,  новый тип копии "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2999,88 +3045,79 @@ msgstr "Ошибка БД: %s"
 msgid "Instance type %s not found for deletion"
 msgstr "Копия типа %s не найдена для выполнения удаления"
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: оформление: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 "check_instance_lock: аргументы: |%(self)s| |%(context)s| "
 "|%(instance_uuid)s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: заблокирован: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: администратор: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: исполнение: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "Невозможно загрузить драйвер виртуализации: %s"
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Драйвер гипервизора не поддерживает правила брандмауэра"
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-#, fuzzy, python-format
-msgid "Exception encountered while terminating the instance"
-msgstr "исключение завершает работу копии %(instance_uuid)s"
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy
 msgid "Instance not found."
 msgstr "Копия не найдена"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "Копия уже была создана"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3089,7 +3126,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:526
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3098,76 +3135,76 @@ msgstr ""
 "Образ '%(image_id)s' размером %(size_bytes)d, превышает exceeded "
 "instance_type допустимый размер %(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Пропуск DiskNotFound: %s"
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr "завершение работы bdm %s"
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Установка состояния копии vm_state на ERROR"
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "Обновление сборки %s"
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "Обновление сборки %s"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "Перезагрузка копии %s"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -3176,12 +3213,12 @@ msgstr ""
 "попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
 "%(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "копия %s: выполнение снимка"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -3190,180 +3227,174 @@ msgstr ""
 "попытка создания снимка не выполняемой копии: %(instance_uuid)s "
 "(состояние: %(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Найдено %(num_images)d образов (ротация: %(rotation)d)"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr "Удаление образа %s"
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "Невозможно назначить пароль администратора. Копия %s не выполняется"
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 #, fuzzy, python-format
 msgid "Root password set"
 msgstr "Копия %s: Назначение административного пароля"
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr "set_admin_password не реализован в этой драйвере."
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr "Ошибка назначения пароля администратора"
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
-#, python-format
+#: nova/compute/manager.py:1124
+#, fuzzy, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
+"попытка перезагрузки не выполняемой копии: %(instance_uuid)s (состояние: "
+"%(state)s ожидалось: %(running)s)"
 
-#: nova/compute/manager.py:1109
-#, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
-msgstr "копия %(instance_uuid)s: обновление агента до %(url)s"
+#: nova/compute/manager.py:1128
+#, fuzzy, python-format
+msgid "updating agent to %(url)s"
+msgstr "Обновление агента до %s"
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr "назначение совпадает с источником!"
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
-msgstr "копия %s: перемещение"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
+msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "копия %s: приостановление"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
+msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "копия %s: снятие с приостановления"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "копия %s: принятие диагностики"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "копия %s: приостановление"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "копия %s: возобновление"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "копия %s: блокирование"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "копия %s: разблокирование"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+#, fuzzy, python-format
+msgid "Getting locked state"
 msgstr "копия %s: получение заблокированного состояния"
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
-msgstr "копия %s: сброс сети"
+#: nova/compute/manager.py:1647
+#, fuzzy
+msgid "Reset network"
+msgstr "Восстановление сети"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
-msgstr ""
+#: nova/compute/manager.py:1655
+#, fuzzy
+msgid "Inject network info"
+msgstr "установка сетевого узла"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+#, fuzzy, python-format
+msgid "Get console output"
+msgstr "Получить консольный вывод для копии %s"
+
+#: nova/compute/manager.py:1699
+#, fuzzy, python-format
+msgid "Getting vnc console"
 msgstr "копия %s: получение консоли vnc"
 
-#: nova/compute/manager.py:1693
+#: nova/compute/manager.py:1727
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1711
-#, fuzzy, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
-msgstr "копия %(instance_uuid)s: обновление агента до %(url)s"
-
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
-#, fuzzy, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
-msgstr "Копия %(instance_id)s не переведена в режим восстановления"
+#: nova/compute/manager.py:1753
+#, python-format
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
+msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1764
 #, python-format
-msgid "Attach failed %(mountpoint)s, removing"
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
 msgstr "Отсоединение тома от неизвестной копии %s"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -3372,45 +3403,45 @@ msgstr ""
 "Создание временного файла %s для оповещения других узлов сети compute о "
 "необходимости присоединения того же хранилища."
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr "plug_vifs() ошибка %(cnt)d.До %(max_retry)d попыток для %(hostname)s."
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3419,24 +3450,23 @@ msgstr ""
 "отсутствует домен с соответствующим именем.\" Эта ошибка может быть "
 "безопасно пропущена."
 
-#: nova/compute/manager.py:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr "Обновление временных данных использования полосы пропускания"
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr "Обновление состояния узла"
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -3445,71 +3475,70 @@ msgstr ""
 "Найдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
 "гипервизоре."
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, пропуск..."
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 "Не распознанное значение '%(action)s' для "
 "FLAGS.running_deleted_instance_action"
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr "Добавление консоли"
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr "Выполнена попытка удаления несуществующей консоли %(console_id)s."
@@ -3554,17 +3583,17 @@ msgstr "Выполнение перезагрузки xvp"
 msgid "xvp not running..."
 msgstr "xvp не выполняется..."
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr "Удаление токена с истёкшим сроком: (%s)"
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr "Полученный токен: %(token)s, %(token_dict)s)"
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "Проверка токена: %(token)s, %(token_valid)s)"
@@ -3573,142 +3602,104 @@ msgstr "Проверка токена: %(token)s, %(token_valid)s)"
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "Нераспознанное значение read_deleted '%s'"
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
-msgstr "python-migrate не установлен. Выход."
-
-#: nova/db/sqlalchemy/migration.py:78
+#: nova/db/sqlalchemy/migration.py:74
 msgid "version should be an integer"
 msgstr ""
 
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
 #: nova/db/sqlalchemy/session.py:137
 #, fuzzy, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr "Ошибка соединения с SQL (%(connstring)s). %(attempts)d попыток осталось."
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr "столбец интерфейса не добавлен  в таблицу сетей"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr "Таблица |%s| не создана!"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr "Столбец VIF не добавлен в таблицу fixed_ips"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
-msgstr "столбец приоритета не добавлен в таблицу сетей"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr "ограничения внешнего ключа не могут быть удалены"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr "столбец выполнения не добавлен в таблицу копий"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr "столбец выполнения не добавлен в таблицу compute_nodes"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+#, fuzzy
+msgid "Foreign Key constraint couldn't be removed"
+msgstr "ограничения внешнего ключа не могут быть удалены"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr ""
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+#, fuzzy
+msgid "foreign key could not be dropped"
+msgstr "ограничения внешнего ключа не могут быть удалены"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
-msgstr ""
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+#, fuzzy
+msgid "foreign key could not be created"
+msgstr "ограничения внешнего ключа не могут быть удалены"
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr "Не владелец образа"
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3767,21 +3758,21 @@ msgstr "Недопустимый префикс для to_global_ipv6: %s"
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr "Недопустимый project_id для to_global_ipv6: %s"
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr "Этот драйвер поддерживает только записи типа 'a'."
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "Предпринята удалить цепочку %s, которая не существует"
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "Неизвестная цепочка: %r"
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
@@ -3790,96 +3781,101 @@ msgstr ""
 "Предпринята попытка удалить правило, которого там нет: %(chain)r %(rule)r"
 " %(wrap)r %(top)r"
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "Запуск интерфейса VLAN %s"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "Запуск моста интерфейса для %s"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, fuzzy, python-format
+msgid "Failed to add interface: %s"
+msgstr "Ошибка приостановления копии"
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "Запуск копии %s"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "Ошибка запуска xvp: %s"
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, fuzzy, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr "Ошибка отсоединения vif копии '%s'"
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr "Сертификат %(certificate_id)s не найден."
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr "Интерфейс %(interface)s не найден"
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "Адрес |%(address)s| не выделен"
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr "Адрес |%(address)s| не выделен вашему проекту |%(project)s|"
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr "Превышена квота для %s, попытка выделения адреса"
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3887,98 +3883,98 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "Домен |%(domain)s| уже существует, изменение зоны на |%(av_zone)s|."
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "Домен |%(domain)s| уже существует, изменение проекта на |%(project)s|."
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr "установка сетевого узла"
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr "исключение сетевых распределений для копии |%s|"
 
-#: nova/network/manager.py:1149
-#, python-format
+#: nova/network/manager.py:1175
+#, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 "instance-dns-zone является |%(domain)s|, который располагается в "
 "доступной зоне |%(zone)s|. Копия |%(instance)s| расположена в зоне "
 "|%(zone2)s|. Запись DNS не будет создана."
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "Арендованный IP |%(address)s|"
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "Присвоенный IP |%(address)s|"
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr "cidr уже используется"
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей супер-сетью "
 "(%(super)s)"
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
@@ -3987,22 +3983,22 @@ msgstr ""
 "запрошенная cidr (%(cidr)s) конфликтует с существующей, меньшей cidr "
 "(%(smaller)s)"
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr "Сеть уже существует!"
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "Сеть должна быть исключена из проекта %s перед удалением"
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -4044,54 +4040,54 @@ msgstr "Невозможно подключиться к серверу. При�
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr "сетевые распределения для копии %s"
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4145,12 +4141,12 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr "Удаление порта %(port_id)s в сети %(net_id)s для %(tenant_id)s"
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr "%s не в допустимых приоритетах"
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -4159,61 +4155,61 @@ msgstr ""
 "Неполадка '%(e)s', попытка отправить в систему уведомлений. "
 "Нагрузка=%(payload)s"
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr "неизвлечённый контекст: %s"
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "получено %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "не определен метод для сообщения: %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "Не определен метод для сообщения: %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr "Выполнение асинхронного вызова %s ..."
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID is %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -4222,16 +4218,16 @@ msgstr ""
 "Удалённая ошибка: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Возврат исключения %s вызывающему"
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4263,41 +4259,41 @@ msgstr ""
 "AMQP сервер на %(hostname)s:%(port)d недоступен: %(err_str)s. Повторная "
 "попытка через %(sleep_time)d секунд."
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr "Ошибка объявления потребителю темы '%(topic)s': %(err_str)s"
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr "Ошибка принятия сообщения из очереди: %s"
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr "Ошибка публикации сообщения в тему '%(topic)s': %(err_str)s"
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, fuzzy, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr "Невозможно подключиться к серверу AMQP: %s "
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4310,59 +4306,59 @@ msgstr "Выполняется ли соответствующая служба?
 msgid "Could not find another compute"
 msgstr "Невозможно найти другой compute"
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr "узел %(dest)s несовместим с исходным узлом %(src)s."
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4427,22 +4423,22 @@ msgstr "host_manager реализован только для 'compute'"
 msgid "No service for compute ID %s"
 msgstr "Нет службы для compute ID %s"
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Ошибка schedule_%(method)s: %(ex)s"
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, fuzzy, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
-msgstr "Копия %(instance_uuid)s не остановлена. (%(vm_state)s"
+msgid "Setting instance to %(state)s state."
+msgstr "%s. Установка состояния копии vm_state на ERROR"
 
 #: nova/scheduler/scheduler_options.py:66
 #, python-format
@@ -4486,29 +4482,29 @@ msgstr "Имитация команды привела к исключению %
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "Ответ на имитацию команды в stdout='%(stdout)s' stderr='%(stderr)s'"
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr "Выполняемые копии: %s"
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "После завершения работы копий: %s"
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr "Внутренняя ошибка"
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "После принудительного завершения работы копий: %s"
@@ -4556,12 +4552,12 @@ msgstr "проект"
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr "Невозможно подтвердить идентификатор экспортированного тома:%s."
@@ -4576,20 +4572,19 @@ msgstr "Заданные данные: %s"
 msgid "Result data: %s"
 msgstr "Итоговые данные: %s"
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Создание файлов в %s для имитации гостевого агента"
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Удаление файлов имитации гостевого агента в %s"
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, fuzzy, python-format
-msgid "Quota exceeded: code=%(code)s"
-msgstr "Превышена квота"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
+msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
 #, python-format
@@ -4611,32 +4606,32 @@ msgstr "_get: %s"
 msgid "_get_all: %s"
 msgstr "_get_all: %s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr "test_snapshot_create: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr "test_snapshot_create: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr "test_snapshot_create_force: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr "test_snapshot_create_force: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr "test_snapshot_show: resp=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr "test_snapshot_detail: resp_dict=%s"
@@ -4698,21 +4693,21 @@ msgstr "Непредвиденный код состояния"
 msgid "Decoding JSON: %s"
 msgstr "Декодирование JSON: %s"
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
@@ -4721,27 +4716,26 @@ msgstr "Получено %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "Ошибка открытия соединения c гипервизором"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr "Запись Compute_service создана для %s "
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr "Запись Compute_service обновлена для %s "
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
-msgstr ""
+#, fuzzy
+msgid "Filters added to instance"
+msgstr "Ошибка перезагрузки копии"
 
 #: nova/virt/firewall.py:139
 msgid "Provider Firewall Rules refreshed"
@@ -4752,7 +4746,7 @@ msgstr "Выполненое обновление правил брандмау�
 msgid "Adding security group rule: %r"
 msgstr "Добавление правила группы безопасности: %r"
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "Добавление правила поставщика: %s"
@@ -4779,27 +4773,27 @@ msgstr ""
 "Необходимо указать vmwareapi_host_ip,vmwareapi_host_username и "
 "vmwareapi_host_password useconnection_type=vmwareapi"
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "В vmwareapi:_create_session, принято это исключение: %s"
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "В vmwareapi:_call_method, принято это исключение: %s"
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "Состояние задачи [%(task_name)s] %(task_ref)s: готово"
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "Состояние задачи [%(task_name)s] %(task_ref)s: ошибка %(error_info)s"
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "В vmwareapi:_poll_task, принята эта ошибка %s"
@@ -4927,84 +4921,84 @@ msgstr "копия %(instance_name)s: удаление файлов копии %
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr "копия %s: Создание образа"
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
@@ -5012,16 +5006,16 @@ msgstr ""
 "Невозможно получить количество ЦПУ, так как эта возможность не "
 "реализована для этой платформы. Эту ошибку можно безопасно пропустить."
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -5073,32 +5067,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr "нет настроенного совместимого обработчика образа"
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr "неизвестный обработчик образа диска: %s"
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr "образ уже присоединён"
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "Ошибка монтирования файловой системы: %s"
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr "Ошибка удаления контейнера: %s"
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5117,11 +5111,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr "Невозможно прикрепить образ для замыкания: %s"
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, fuzzy, python-format
+msgid "partition %s not found"
 msgstr "разделы не найдена"
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5144,81 +5144,81 @@ msgstr "ошибка qemu-nbd: %s"
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr "Неполадка с подключением к libvirt"
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy, python-format
 msgid "Instance soft rebooted successfully."
 msgstr "снимок %s: создание завершено"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -5227,76 +5227,76 @@ msgstr ""
 "Найдены %(migration_count)d неподтверждённых перемещений, старше "
 "%(confirm_window)d секунд"
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr "Автоматические подтверждение перемещения %d"
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Пользователь не имеет административных привилегий"
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr "Создание изображения"
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr "block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -5305,28 +5305,28 @@ msgstr ""
 "Ошибка libvirt во время поиска %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "устаревшая версия libvirt (не поддерживается getVersion)"
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr "'<cpu>' должно быть 1, но %d\n"
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5336,43 +5336,40 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 #, fuzzy, python-format
 msgid "Instance running successfully."
 msgstr "Копия %s: выполнение"
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5405,151 +5402,172 @@ msgstr "nwfilter(%(instance_filter_name)s) для%(name)s не найден."
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "Брандмауэр iptables: Настройка базовой фильтрации"
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr "Невозможно найти открытый порт"
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, fuzzy, python-format
+msgid "Reading image info file: %s"
+msgstr "Выгрузка образа %s"
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "_создать: %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "Запуск моста интерфейса для %s"
+
+#: nova/virt/libvirt/utils.py:395
+#, fuzzy, python-format
+msgid "Wrote: %s"
+msgstr "_создать: %s"
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#, fuzzy, python-format
+msgid "Failed while unplugging vif"
 msgstr "Ошибка отсоединения vif копии '%s'"
 
 #: nova/virt/libvirt/volume.py:163
@@ -5582,33 +5600,33 @@ msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
-#, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+#, fuzzy, python-format
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "Свойство %(attr)s не назначено для управляемого объекта %(objName)s"
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr "Отсутствуют зарегистрированные ВМ"
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "Завершение сеанса с неполадками или уже завершённого сеанса: %s"
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr "Сеанс имеет неполадки"
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr "Недопустимый сеанс"
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr " Отсутствуют зарегистриованные виртуальные машины"
 
@@ -5690,23 +5708,23 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+#, fuzzy, python-format
+msgid "Creating VM on the ESX  host"
 msgstr "Создание ВМ с именем %s на узле ESX"
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+#, fuzzy, python-format
+msgid "Created VM on the ESX  host"
 msgstr "Создание ВМ с именем %s на узле ESX"
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5720,225 +5738,216 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+#, fuzzy, python-format
+msgid "Powering on the VM instance"
 msgstr "Включение питания на копии ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+#, fuzzy, python-format
+msgid "Powered on the VM instance"
 msgstr "Питание включено на копии ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+#, fuzzy, python-format
+msgid "Creating Snapshot of the VM instance"
 msgstr "Создание снимка копии ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+#, fuzzy, python-format
+msgid "Created Snapshot of the VM instance"
 msgstr "Создание снимка копии ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr "Выгрузка образа %s"
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr "Выгруженный образ %s"
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr "Удаление временного файла vmdk %s"
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr "Удалённый временный файл vmdk %s"
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr "копия не включена"
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+#, fuzzy, python-format
+msgid "Rebooting guest OS of VM"
 msgstr "Перезагрузка гостевой ОС ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+#, fuzzy, python-format
+msgid "Rebooted guest OS of VM"
 msgstr "Выполнена перезагрузка гостевой ОС ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+#, fuzzy, python-format
+msgid "Doing hard reboot of VM"
 msgstr "Выполнение безотказной перезагрузки ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
-msgstr ""
+#: nova/virt/vmwareapi/vmops.py:542
+#, fuzzy, python-format
+msgid "Did hard reboot of VM"
+msgstr "Выполнение безотказной перезагрузки ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
 msgstr "копия - %s не представлена"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+#, fuzzy, python-format
+msgid "Powering off the VM"
 msgstr "Выключение питания ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+#, fuzzy, python-format
+msgid "Powered off the VM"
 msgstr "Питание ВМ %s выключено"
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+#, fuzzy, python-format
+msgid "Unregistering the VM"
 msgstr "Исключение регистрации ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+#, fuzzy, python-format
+msgid "Unregistered the VM"
 msgstr "Незарегистрированная ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+#, fuzzy, python-format
+msgid "Suspending the VM"
 msgstr "Приостановка ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+#, fuzzy, python-format
+msgid "Suspended the VM"
 msgstr "Приостановленная ВМ %s "
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr "Питание копии выключено и следовательно она не может быть приостановлена."
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+#, fuzzy, python-format
+msgid "Resuming the VM"
 msgstr "Возобновление работы ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+#, fuzzy, python-format
+msgid "Resumed the VM"
 msgstr "Работа ВМ %s возобновлена "
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr "копия не в приостановленном состоянии"
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Создание папки с адресом %s"
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Создана папка с адресом %s"
@@ -5948,32 +5957,32 @@ msgstr "Создана папка с адресом %s"
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr "Получение размера образа для образа %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "Принят размер образа %(size)s для образа %(image)s"
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5983,46 +5992,60 @@ msgstr ""
 "(необязательно) и xenapi_connection_password для использования "
 "connection_type=xenapi"
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, fuzzy, python-format
+msgid "Could not determine key: %s"
+msgstr "Ошибка дешифрирования личного ключа: %s"
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr "Запуск узла на XenServer не поддерживается."
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 "Невозможно выполнить вход в XenAPI (недостаточно свободного места на "
 "Dom0?)"
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr "Исключение: %s"
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake не имеет реализации для %s"
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "Выполняется вызов %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr "Выполняется вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "Выполняется вызов getter %s"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6115,57 +6138,57 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 #, fuzzy, python-format
 msgid "Created VM"
 msgstr "_создать: %s"
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "VBD не найдено для копии %s"
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "группа %s уже существует"
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "Невозможно отсоединить VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "Невозможно ликвидировать VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "Создана VBD %(vbd_ref)s для ВМ %(vm_ref)s, VDI %(vdi_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "Невозможно ликвидировать VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6174,61 +6197,61 @@ msgstr ""
 "Создан VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) "
 "на %(sr_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "Отсутствует первичный VDI для%(vm_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, fuzzy, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr "Снимок ВМ %(vm_ref)s с меткой '%(label)s'..."
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, fuzzy, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr "Создан снимок %(template_vm_ref)s из ВМ %(vm_ref)s."
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "Запрос xapi для выгрузки %(vdi_uuids)s в качестве ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr "Запрос xapi на приём образа vhd %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
@@ -6237,17 +6260,17 @@ msgstr ""
 "xapi 'download_vhd' возвратил VDI типа '%(vdi_type)s' с UUID "
 "'%(vdi_uuid)s'"
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
@@ -6256,17 +6279,17 @@ msgstr ""
 "Размер образа %(size_bytes)d превышает допустимый instance_type  размер "
 "%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, fuzzy, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
@@ -6275,211 +6298,206 @@ msgstr ""
 "Превышен размер ядра/Ramdisk образа: %(vdi_size)d байт, макс. "
 "%(max_size)d байт"
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "Копирование VDI %s в /boot/guest на dom0"
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "Ядро/Ramdisk VDI %s ликвидирован"
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 #, fuzzy
 msgid "Failed to fetch glance image"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "Обнаружен %(image_type_str)s формат для образа %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "Поиск vdi %s для ядра PV"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "Неизвестный формат образа %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s до сих пор доступен"
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "Повторная проверка SR %s"
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr "Невозможно найти SR типа содержимого ISO"
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO: поиск SR %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr "ISO: не содержимое iso типа"
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr "ISO: SR с локальной PBD"
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "Время ожидания при создании устройства %s"
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "Подсоединение VBD %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "Подсоединение VBD %s выполнено."
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s подсоединено как %(orig_dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 "VBD %(vbd_ref)s подсоединено в неправильный dev, изменение назначения на "
 "%(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "Ликвидирование VBD для VDI %s ... "
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "Ликвидирование VBD для VDI %s завершено."
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "Найдено ядро Xen %s"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "Ядро Xen не найдено.  Загрузка HVM."
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr "Разделы:"
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d секторов"
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
@@ -6488,164 +6506,168 @@ msgstr ""
 "Запись таблицы разделов %(primary_first)d %(primary_last)d в "
 "%(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "Запись таблицы разделов %s выполнена."
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr "Средства XenServer не установлены в этот образ"
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 "Ошибка присоединения файловой системы (ожидаемо для копий не на базе "
 "linux): %s"
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "Обновление выполнения копии '%(instance_uuid)s' до %(progress)d"
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy, python-format
 msgid "Starting instance"
 msgstr "Запуск копии %s"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "Удаление ядра/ramdisk файлов из dom0"
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "Ошибка обновления тома в базе данных"
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 #, fuzzy, python-format
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 "Автоматическая настройка диска для копии %(instance_uuid)s, выполняется "
 "попытка изменения размера раздела..."
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 #, fuzzy
 msgid "Starting VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr "Запрос версии агента"
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "Версия агента копии: %s"
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr "Обновление агента до %s"
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, fuzzy, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr "Недопустимое значение для injected_files: '%s'"
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr "Настройка пароля администратора"
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr "Восстановление сети"
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
+#: nova/virt/xenapi/vmops.py:581
 #, fuzzy, python-format
-msgid "Could not find VM by name"
-msgstr "В запросе невозможно найти %s."
+msgid "Could not find VM with name %s"
+msgstr "Невозможно найти конфигурацию по адресу %(path)s"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 #, fuzzy, python-format
 msgid "Finished snapshot and upload for VM"
 msgstr "Готовый снимок и выгрузка для ВМ %s"
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 #, fuzzy, python-format
 msgid "Starting snapshot for VM"
 msgstr "Запуск снимка для ВМ %s"
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "Невозможно найти узел для копии %s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr "Ошибка перемещения vhd на новый узел"
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "Изменение размера VDI %(cow_uuid)s с %(old_gb)dГБ до %(new_gb)dГБ"
@@ -6690,43 +6712,43 @@ msgstr "Ошибка обновления пароля: %(resp)r"
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr "Невозможно найти VBD для ВМ"
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 #, fuzzy, python-format
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 "Копия %(instance_uuid)s использует RAW или VHD, пропуск ядра и удаление "
 "ramdisk"
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "копия содержит ядро или ramdisk, но не оба"
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr "файлы ядра/ramdisk удалены"
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 #, fuzzy
 msgid "Destroying VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr "ВМ не предоставлена, пропуск выполнения ликвидации..."
 
@@ -6745,67 +6767,67 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr "Автоматическая безотказная перезагрузка %d"
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "Завершение работы ВМ для копии %(instance_uuid)s"
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "Копия %(instance_id)s не найдена"
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 #, fuzzy, python-format
 msgid "In ERROR state"
 msgstr "Ошибка БД: %s"
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr "Невозможно получить сведения о пропускной способности."
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 #, fuzzy
 msgid "Injecting network info to xenstore"
 msgstr "установка сетевого узла"
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 #, fuzzy
 msgid "Creating vifs"
 msgstr "Создание изображения"
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "Создание VIF для ВМ %(vm_ref)s, сеть %(network_ref)s."
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, fuzzy, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
@@ -6814,14 +6836,14 @@ msgstr ""
 "Вызов агентом %(method)s возвратил недопустимый ответ: %(ret)r. VM "
 "id=%(instance_uuid)s; path=%(path)s; args=%(addl_args)r"
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, fuzzy, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 "ВРЕМЯ ПРОСТОЯ: Срок вызова %(method)s истёк. VM id=%(instance_uuid)s; "
 "args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -6830,12 +6852,12 @@ msgstr ""
 "НЕ РЕАЛИЗОВАНО: Вызов %(method)s не поддерживается агентом. VM "
 "id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "Вызов %(method)s возвратил ошибку: %(e)s."
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Ошибка OpenSSL: %s"
@@ -6868,7 +6890,7 @@ msgid "introducing sr within volume_utils"
 msgstr "внедрение sr в volume_utils"
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "внедрён %(label)s в качестве %(sr_ref)s."
@@ -6881,11 +6903,11 @@ msgstr "Создание pbd для SR"
 msgid "Plugging SR"
 msgstr "Подключение SR"
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr "Невозможно внедрить Репозиторий хранения"
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr "Невозможно получить SR с использованием uuid"
 
@@ -6953,101 +6975,101 @@ msgstr "Невозможно получить сведения назначен�
 msgid "Mountpoint cannot be translated: %s"
 msgstr "Точка подключения не может быть переведена: %s"
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr "Создание SR %s"
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr "Невозможно создать SR"
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr "Невозможно получить запись SR"
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr "Внедрение SR %s"
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr "SR найдено в базе данных xapi. Нет необходимости во внедрении"
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr "Невозможно внедрить SR"
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr "Проверка SR %s"
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr "SR %s не найден в базе данных xapi"
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr "Невозможно забыть SR"
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Невозможно создать VDI на SR %(sr_ref)s для копии %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "Невозможно использовать SR %(sr_ref)s для копии %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "Невозможно присоединить том для копии %s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "Точка подключения %(mountpoint)s присоединена к копии %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "Невозможно найти том %s"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "Невозможно отсоединить том %s"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr "Невозможно ликвидировать vbd %s"
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr "Ошибка очистки SR %s"
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Точка подключения %(mountpoint)s отсоединена от копии %(instance_name)s"
@@ -7186,117 +7208,117 @@ msgstr "rbd не имеет пула %s"
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog не выполняется: %s"
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr "Sheepdog не выполняется"
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "Повторное экспортирование %s томов"
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "том %s: пропуск экспортирования"
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "том %s: создание"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr "том %(vol_name)s: создание lv объёмом %(vol_size)sG"
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "том %s: создание экспортирования"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "том %s: создание завершено"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr "Том до сих пор присоединён"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr "том %s: удаление экспортирования"
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "том %s: удаление"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr "том %s: том занят"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "том %s: удаление завершено"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "снимок %s: создание"
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "снимок %(snap_name)s: создание"
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "снимок %s: создание завершено"
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "снимок %s: удаление"
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "снимок %s: создание завершено"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "снимок %s: удаление выполнено"
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr "Проверка возможностей тома"
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr "Обнаружены новые возможности: %s"
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr "Очистить возможности"
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr "Принято уведомление {%s}"
@@ -7326,75 +7348,80 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr "Ошибка обновления базы данных"
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "Ошибка поиска vbd для vdi %s"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "Невозможно найти экспортирование iSCSI для тома %s"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, fuzzy, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr "Ошибка получения метаданных для ip: %s"
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, fuzzy, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr "Ошибка получения метаданных для ip: %s"
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, fuzzy, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr "Ошибка получения метаданных для ip: %s"
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, fuzzy, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr "Ошибка получения метаданных для ip: %s"
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr "Задайте san_password или san_private_key"
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr "san_ip должен быть назначен"
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "LUID не найден для %(zfs_poolname)s. Вывод=%(out)s"
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr "Возврат команды CLIQ %s"
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 "Неправильный ответ на команду CLIQ %(verb)s %(cliq_args)s. "
 "Результат=%(out)s"
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr "Ошибка выполнения команды CLIQ %(verb)s %(cliq_args)s.  Результат=%(out)s"
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
@@ -7403,71 +7430,66 @@ msgstr ""
 "Непредвиденное количество виртуальных ip для кластера  %(cluster_name)s. "
 "Результат=%(_xml)s"
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr "Сведения о томе: %(volume_name)s => %(volume_attributes)s"
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr "local_path не поддерживается"
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr "Невозможно определить проект для тома %s, невозможно экспортировать"
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
 msgstr "Удалить том с идентификатором: %s"
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7521,36 +7543,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr "XenSMDriver необходимо xenapi соединение"
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr "Ошибка начала сеанса"
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr "Том будет создан во внутреннем интерфейсе - %d"
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr "Ошибка обновления тома в базе данных"
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr "Невозможно создать том"
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr "Ошибка удаления vdi"
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr "Ошибка удаления тома в базе данных"
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr "Ошибка поиска тома в базе данных"
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr "Ошибка поиска внутреннего интерфейса в базе данных"
 
@@ -7632,6 +7654,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr "Служба томов в данный момент недоступна."
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7650,6 +7675,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "Вложенное исключение: %s"
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7666,6 +7694,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr "Исходное исключение было сброшено"
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr "Выполняется останов сервера TCP."
 
@@ -7678,12 +7709,41 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr "%(user_id)s не может быть найден с токеном '%(token)s'"
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr "%(user_id)s должен быть администратором или участником %(project_id)s"
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr "В запросе невозможно найти %s."
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr "Аутентификация '%s' выполнена"
+
+#~ msgid "User not found with provided API key."
+#~ msgstr "Не найден пользователь с предоставленным API ключом."
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+#~ "Предоставленный ключ API допустим, но не"
+#~ " для пользователя '%(username)s'"
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr "Тело не предоставлено"
 
@@ -7735,6 +7795,11 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+#~ "Превышена квота для %(pid)s, превышено "
+#~ "ключевое свойство метаданных или значение"
+
 #~ msgid "Creating a raw instance"
 #~ msgstr "Создание необработанной копии"
 
@@ -7760,8 +7825,8 @@ msgstr ""
 #~ "БД, но будет выполнено выключение "
 #~ "используя особый контекст"
 
-#~ msgid "Instance %s not found."
-#~ msgstr "Копия %s не найдена."
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr "исключение завершает работу копии %(instance_uuid)s"
 
 #~ msgid "trying to destroy already destroyed instance: %s"
 #~ msgstr "попытка ликвидации уже ликвидированной копии: %s"
@@ -7776,6 +7841,58 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr "копия %(instance_uuid)s: обновление агента до %(url)s"
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr "копия %s: перемещение"
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "копия %s: приостановление"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "копия %s: снятие с приостановления"
+
+#~ msgid "instance %s: resuming"
+#~ msgstr "копия %s: возобновление"
+
+#~ msgid "instance %s: locking"
+#~ msgstr "копия %s: блокирование"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "копия %s: разблокирование"
+
+#~ msgid "instance %s: reset network"
+#~ msgstr "копия %s: сброс сети"
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7793,9 +7910,48 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr "python-migrate не установлен. Выход."
+
+#~ msgid "interface column not added to networks table"
+#~ msgstr "столбец интерфейса не добавлен  в таблицу сетей"
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr "Столбец VIF не добавлен в таблицу fixed_ips"
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr "Невозможно перейти на предыдущую версию без потери данных"
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr "столбец приоритета не добавлен в таблицу сетей"
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr "столбец выполнения не добавлен в таблицу копий"
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr "столбец выполнения не добавлен в таблицу compute_nodes"
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7880,9 +8036,6 @@ msgstr ""
 #~ msgid "Must implement host selection mechanism"
 #~ msgstr ""
 
-#~ msgid "Maximum number of hosts selected (%d)"
-#~ msgstr "Выбрано макс. количество узлов (%d)"
-
 #~ msgid "Selected excessive host %(host)s"
 #~ msgstr ""
 
@@ -7991,6 +8144,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr "Тест: Том получает: id=%(volume_id)s"
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr "Состояние задачи [%(name)s] %(task)s: готово    %(result)s"
 
@@ -8018,12 +8177,21 @@ msgstr ""
 #~ "в xml...\n"
 #~ ":%s "
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -8062,6 +8230,45 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr "Созданная ВМ %s..."
 
@@ -8090,6 +8297,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "Создание VBD для VDI %s ... "
 
@@ -8236,6 +8449,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr "Ошибка приёма сведений QoS"
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr "Невозможно определить проект для тома %s, невозможно экспортировать"
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index 052ebdc17..659ac37ad 100644
--- a/nova/locale/tl/LC_MESSAGES/nova.po
+++ b/nova/locale/tl/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Tagalog <tl@li.org>\n"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Merong hindi-inaasahang pagkakamali habang tumatakbo ang command."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -80,257 +80,262 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -338,745 +343,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1100,364 +1142,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr ""
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1466,240 +1509,245 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1740,39 +1788,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1803,31 +1818,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1836,57 +1863,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1981,31 +2008,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2030,216 +2069,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2315,7 +2341,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2408,32 +2433,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2462,23 +2488,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2530,114 +2556,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2649,261 +2682,272 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2922,493 +2966,467 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1764
 #, python-format
-msgid "Attach failed %(mountpoint)s, removing"
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3453,17 +3471,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3472,37 +3490,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3510,104 +3528,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3666,117 +3643,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3784,115 +3766,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3932,54 +3914,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4031,89 +4013,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "natanggap %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "Walang paraan para sa mensahe: %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4141,41 +4123,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4188,59 +4170,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4305,21 +4287,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4364,29 +4346,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4434,12 +4416,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4454,19 +4436,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4489,32 +4470,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4573,21 +4554,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4596,26 +4577,24 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4627,7 +4606,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4652,27 +4631,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4800,99 +4779,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4944,32 +4923,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4988,11 +4967,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5015,182 +5000,182 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5200,42 +5185,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5266,151 +5248,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "natanggap %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "Writing image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5442,32 +5444,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5549,23 +5551,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5579,225 +5579,199 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5807,76 +5781,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5966,512 +5954,512 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6515,39 +6503,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6565,88 +6553,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6679,7 +6667,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6692,11 +6680,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6764,101 +6752,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -6993,117 +6981,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7132,144 +7120,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, python-format
 msgid "No LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, python-format
 msgid "Deleting volumeID: %s"
 msgstr ""
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7323,36 +7311,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7433,6 +7421,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7454,6 +7445,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7470,6 +7464,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7482,12 +7479,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7536,6 +7560,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7629,6 +7656,73 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: retrieving diagnostics"
+#~ msgstr ""
+
+#~ msgid "instance %s: suspending"
+#~ msgstr ""
+
+#~ msgid "instance %s: resuming"
+#~ msgstr ""
+
+#~ msgid "instance %s: locking"
+#~ msgstr ""
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting locked state"
+#~ msgstr ""
+
+#~ msgid "instance %s: reset network"
+#~ msgstr ""
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid "Detaching volume from unknown instance %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7646,15 +7740,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7845,6 +7986,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7859,6 +8006,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7873,12 +8023,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7917,6 +8076,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr ""
 
@@ -7955,6 +8213,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8158,6 +8422,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index 07c35373a..8c26986a4 100644
--- a/nova/locale/tr/LC_MESSAGES/nova.po
+++ b/nova/locale/tr/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2011-12-14 18:10+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr ""
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -80,257 +80,262 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -338,745 +343,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1100,364 +1142,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr ""
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1466,240 +1509,245 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1740,39 +1788,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1803,31 +1818,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1836,57 +1863,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1981,31 +2008,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2030,216 +2069,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2315,7 +2341,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2408,32 +2433,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2462,23 +2488,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2530,114 +2556,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2649,261 +2682,272 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2922,493 +2966,467 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1764
 #, python-format
-msgid "Attach failed %(mountpoint)s, removing"
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3453,17 +3471,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3472,37 +3490,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3510,104 +3528,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3666,117 +3643,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3784,115 +3766,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3932,54 +3914,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4031,89 +4013,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4141,41 +4123,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4188,59 +4170,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4305,21 +4287,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4364,29 +4346,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4434,12 +4416,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4454,19 +4436,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4489,32 +4470,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4573,21 +4554,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4596,26 +4577,24 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4627,7 +4606,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4652,27 +4631,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4800,99 +4779,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4944,32 +4923,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4988,11 +4967,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5015,182 +5000,182 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5200,42 +5185,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5266,151 +5248,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, python-format
+msgid "Read: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "Writing image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5442,32 +5444,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5549,23 +5551,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5579,225 +5579,199 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5807,76 +5781,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5966,512 +5954,512 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6515,39 +6503,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6565,88 +6553,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6679,7 +6667,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6692,11 +6680,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6764,101 +6752,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -6993,117 +6981,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7131,144 +7119,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, python-format
 msgid "No LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, python-format
 msgid "Deleting volumeID: %s"
 msgstr ""
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7322,36 +7310,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7432,6 +7420,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7453,6 +7444,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7469,6 +7463,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7481,12 +7478,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7535,6 +7559,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7628,6 +7655,73 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: retrieving diagnostics"
+#~ msgstr ""
+
+#~ msgid "instance %s: suspending"
+#~ msgstr ""
+
+#~ msgid "instance %s: resuming"
+#~ msgstr ""
+
+#~ msgid "instance %s: locking"
+#~ msgstr ""
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting locked state"
+#~ msgstr ""
+
+#~ msgid "instance %s: reset network"
+#~ msgstr ""
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid "Detaching volume from unknown instance %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7645,15 +7739,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7847,6 +7988,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7861,6 +8008,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7875,12 +8025,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7919,6 +8078,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr ""
 
@@ -7957,6 +8215,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8160,6 +8424,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 287739c42..a4c19645b 100644
--- a/nova/locale/uk/LC_MESSAGES/nova.po
+++ b/nova/locale/uk/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2011-08-23 11:21+0000\n"
 "Last-Translator: Thierry Carrez <thierry.carrez+lp@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -67,11 +67,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "Неочікувана помилка при виконанні команди."
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -81,257 +81,262 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr ""
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr ""
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr ""
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -339,745 +344,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1101,364 +1143,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr ""
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr "Занадто багато невдалих аутентифікацій."
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1467,241 +1510,246 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Це правило вже існує в групі %s"
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Створити розділ на %s ГБ"
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr "лише група \"всі\" підтримується"
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1742,39 +1790,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1805,31 +1820,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1838,57 +1865,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1983,31 +2010,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2032,216 +2071,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2317,7 +2343,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2410,32 +2435,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2464,23 +2490,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2532,114 +2558,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr "Це правило вже існує в групі %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2651,261 +2684,272 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2924,493 +2968,467 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
+#: nova/compute/manager.py:1764
 #, python-format
-msgid "Attach failed %(mountpoint)s, removing"
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3455,17 +3473,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3474,37 +3492,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3512,104 +3530,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3668,117 +3645,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3786,115 +3768,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3934,54 +3916,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4033,89 +4015,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "отримано %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "без порядку для повідомлень: %s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "Без порядку для повідомлень: %s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4143,41 +4125,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4190,59 +4172,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4307,21 +4289,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4366,29 +4348,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4436,12 +4418,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4456,19 +4438,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4491,32 +4472,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4575,21 +4556,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4598,26 +4579,24 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4629,7 +4608,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4654,27 +4633,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4802,99 +4781,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4946,32 +4925,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4990,11 +4969,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5017,182 +5002,182 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5202,42 +5187,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5268,151 +5250,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "отримано %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "Writing image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5444,32 +5446,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5551,23 +5553,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5581,225 +5581,199 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5809,76 +5783,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "Оголошення черги %s"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5968,512 +5956,512 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6517,39 +6505,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6567,88 +6555,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6681,7 +6669,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6694,11 +6682,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6766,101 +6754,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
@@ -6995,117 +6983,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7134,144 +7122,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, python-format
 msgid "No LUN ID for volume %s"
 msgstr ""
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
 msgstr "Від'єднати том %s"
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7325,36 +7313,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7435,6 +7423,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7456,6 +7447,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7472,6 +7466,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7484,12 +7481,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7538,6 +7562,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7631,6 +7658,73 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: retrieving diagnostics"
+#~ msgstr ""
+
+#~ msgid "instance %s: suspending"
+#~ msgstr ""
+
+#~ msgid "instance %s: resuming"
+#~ msgstr ""
+
+#~ msgid "instance %s: locking"
+#~ msgstr ""
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting locked state"
+#~ msgstr ""
+
+#~ msgid "instance %s: reset network"
+#~ msgstr ""
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid "Detaching volume from unknown instance %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7648,15 +7742,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7796,9 +7937,6 @@ msgstr ""
 #~ msgid "Publishing to route %s"
 #~ msgstr ""
 
-#~ msgid "Declaring queue %s"
-#~ msgstr "Оголошення черги %s"
-
 #~ msgid "Declaring exchange %s"
 #~ msgstr "Оголошення точки обміну %s"
 
@@ -7844,6 +7982,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7858,6 +8002,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7872,12 +8019,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7916,6 +8072,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr ""
 
@@ -7954,6 +8209,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8157,6 +8418,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""
 
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 86919c2e8..3ec9de140 100644
--- a/nova/locale/zh_CN/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_CN/LC_MESSAGES/nova.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
-"PO-Revision-Date: 2012-04-03 23:36+0000\n"
-"Last-Translator: cheesecake <Unknown>\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
+"PO-Revision-Date: 2012-05-07 06:51+0000\n"
+"Last-Translator: Edward <Unknown>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 "MIME-Version: 1.0\n"
@@ -66,11 +66,11 @@ msgstr "项目证书的标题，%s 依次分别为项目，时间戳"
 msgid "Flags path: %s"
 msgstr "标记所在路径：%s"
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "运行命令时出现意外错误"
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -85,258 +85,263 @@ msgstr ""
 "标准输出：%(stdout)r\n"
 "标准错误输出：%(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr "数据库异常被包裹。"
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr "发生未知异常。"
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr "解密文本失败"
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr "无法在镜像服务中翻页"
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr "虚拟接口创建失败"
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "用唯一mac地址5次尝试创建虚拟接口失败"
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr "连接到glance失败"
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr "连接到melange失败"
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr "未授权。"
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr "用户没有管理员权限"
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "政策不允许 %(action)s 被执行。"
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "没有为镜像 %(image_id)s 找到内核。"
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr "无法接受的参数。"
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr "无效的快照"
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "卷 %(volume_id)s 没有附加任何东西"
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr "密钥对数据无效"
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr "把数据加载为json格式失败"
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr "请求无效。"
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr "无效签名 %(signature)s 针对用户是 %(user)s"
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr "收到无效的输入"
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr "无效的实例类型 %(instance_type)s。"
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr "无效的卷类型"
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr "无效的卷"
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr "无效的元数据"
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "无效的端口范围 %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "无效的IP协议 %(protocol)s。"
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "无效的内容类型 %(content_type)s。"
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "无效的cidr %(cidr)s。"
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr "无效的RPC连接重用。"
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr "无法执行action '%(action)s' 于聚合 %(aggregate_id)s 上。原因： %(reason)s。"
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr "实例 %(instance_uuid)s 处于%(attr)s %(state)s 中。该实例在这种状态下不能执行 %(method)s。"
 
-#: nova/exception.py:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "实例 %(instance_id)s 没有运行。"
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr "实例 %(instance_id)s 没有挂起。"
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "实例 %(instance_id)s 不在救援模式。"
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr "挂起实例失败"
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr "服务器恢复失败"
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "重新启动实例失败"
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
-msgstr "该时刻服务无法使用。"
-
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr "该时刻卷服务无法使用。"
+msgstr "此时的付不可用。"
 
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
-msgstr "该时刻计算服务无法使用。"
+msgstr "此时的计算服务不可用。"
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "无法把实例 (%(instance_id)s) 迁移到当前主机 (%(host)s)。"
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
-msgstr "该时刻目标计算主机无法使用。"
+msgstr "此时的目标计算主机不可用。"
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
-msgstr "该时刻原始计算主机无法使用。"
+msgstr "此时的原始计算主机不可用。"
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr "提供的虚拟机管理程序类型无效。"
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "该实例需要比当前版本更新的虚拟机管理程序。"
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "提供的磁盘路径 (%(path)s) 已经存在，预计是不存在的。"
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "提供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr "无法接受的CPU信息"
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s 不是有效的IP v4/6地址。"
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr "VLAN标签对于端口组%(bridge)s 是不适合的。预计的VLAN标签是 %(tag)s，但与端口组关联的是 %(pgroup)s。"
 
-#: nova/exception.py:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -346,745 +351,782 @@ msgstr ""
 "包含端口组 %(bridge)s 的vSwitch没有与预计的物理适配器关联。预计的vSwitch是 %(expected)s，但关联的是 "
 "%(actual)s。"
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "磁盘格式 %(disk_format)s 不能接受"
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "镜像 %(image_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "实例 %(instance_id)s 无法接受，原因是： %(reason)s"
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s 无法接受。"
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr "资源没有找到。"
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr "要求的标记 %(flag)s 没有设置。"
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "卷 %(volume_id)s 没有找到。"
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, fuzzy, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr "无法找到帐户 %(account_name) on Solidfire 设备"
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr "没有为实例 %(instance_id)s 找到卷。"
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr "卷 %(volume_id)s 没有含键 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr "没有找到卷类型。"
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr "卷类型 %(volume_type_id)s 没有找到。"
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr "名为 %(volume_type_name)s 的卷类型没有找到。"
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr "卷类型 %(volume_type_id)s 没有额外说明键 %(extra_specs_key)s 。"
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr "正在删除有快照的卷  %(volume_name)s"
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "没有为卷 %(volume_id)s 找到目标id。"
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "在 %(location)s 没有磁盘"
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "无法为 %(driver_type)s 卷找到句柄。"
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "无效的镜像href %(image_href)s。"
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr "有些镜像通过hrefs存储。该api版本不支持显示镜像hrefs。"
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "镜像 %(image_id)s 没有找到。"
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr "没有为镜像 %(image_id)s 找到内核。"
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr "用户 %(user_id)s 没有找到。"
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr "用户 %(user_id)s 不是项目 %(project_id)s 的成员。"
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr "角色 %(role_id)s 没有找到。"
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr "没有找到存储库来读写VDI。"
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "创建网络 %(req)s  是必要的。"
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "无法为桥 %(bridge)s 找到网络"
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "无法为uuid %(uuid)s 找到网络"
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "无法为cidr %(cidr)s 找到网络。"
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr "没有网络定义。"
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr "或者网络uuid %(network_uuid)s不存在，或者它没有分配给项目 %(project_id)s。"
 
-#: nova/exception.py:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr "主机没有设置于网络 (%(network_id)s)。"
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, fuzzy, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr "网络 %s 存在活跃的端口，无法删除"
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "无法找到虚拟机使用的数据存储引用。"
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "没有固定IP与id %(id)s 关联。"
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "没有为地址 %(address)s 找到固定IP。"
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr "实例 %(instance_id)s 没有固定ip。"
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "网络主机 %(host)s 在网络 %(network_id)s 中没有固定ip。"
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr "实例 %(instance_id)s 没有固定ip '%(ip)s'。"
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr "主机 %(host)s 没有固定IP。"
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr "固定IP地址 (%(address)s) 在网络 (%(network_uuid)s) 中不存在。"
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr "固定IP地址 %(address)s 已在使用。"
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "固定IP地址 %(address)s 无效。"
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr "没有固定ip可用。"
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr "找不到固定IP。"
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "找不到适合id %(id)s 的浮动IP。"
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "DNS 入口 %(name)s 已经在域中 %(domain)s 存在。"
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "找不到适合地址 %(address)s 的浮动ip。"
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr "没有浮动IP可用。"
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "浮动ip %(address)s 已被关联。"
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "浮动ip %(address)s 没有被关联。"
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr "没有浮动ip存在。"
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "接口 %(interface)s没有找到。"
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr "证书 %(certificate_id)s 没有找到。"
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "服务 %(service_id)s 没有找到。"
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "主机 %(host)s 没有找到。"
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "计算主机 %(host)s 没有找到。"
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "没有找到二进制 %(binary)s 在主机 %(host)s 上。"
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr "认证令牌 %(token)s 没有找到。"
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr "访问密钥 %(access_key)s 没有找到。"
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr "配额没有找到。"
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到配额。"
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "安全组 %(security_group_id)s 没有找到。"
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr "没有找到安全组 %(security_group_id)s 针对项目 %(project_id)s 。"
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr "安全组 %(security_group_id)s 已经与实例 %(instance_id)s 关联。"
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr "安全组 %(security_group_id)s 没有与实例 %(instance_id)s 关联。"
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "迁移 %(migration_id)s 没有找到。"
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "没有为实例 %(instance_id)s 找到迁移其状态为 %(status)s 。"
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "控制台池 %(pool_id)s 没有找到。"
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr "没有找到类型是 %(console_type)s 的控制台池针对计算主机 %(compute_host)s 在代理主机 %(host)s 上。"
 
-#: nova/exception.py:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "控制台%(console_id)s 没有找到。"
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到控制台。"
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr "没有为实例 %(instance_id)s 在池 %(pool_id)s 中找到控制台。"
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr "无效的控制台类型 %(console_type)s "
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr "没有找到实例类型。"
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "名为 %(instance_type_name)s 的实例类型没有找到。"
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "类型 %(flavor_id)s 没有找到。"
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, fuzzy, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr "区域 %(zone_id)s 没有找到。"
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "调度器主机过滤器 %(filter_name)s 没有找到。"
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr "调度器的成本函数 %(cost_fn_str)s 没有找到。"
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr "未找到调度器的权重标记：%(flag_name)s"
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, fuzzy, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数据。"
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr "实例类型 %(instance_type_id)s 没有额外的 键为%(extra_specs_key)s 的规格说明。"
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr "未定义LDAP对象"
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr "没有找到LDAP用户 %(user_id)s。"
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr "没有找到LDAP用户组 %(group_id)s。"
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr "LDAP用户 %(user_id)s 不是 %(group_id)s 的组成员。"
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "找不到文件 %(file_path)s。"
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr "没找到文件"
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "未找到与网络适配器 %(adapter)s 关联的虚拟交换机。"
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "未找到网络适配器 %(adapter)s。"
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "找不到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr "操作不允许。"
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr "无法使用全局角色 %(role_id)s"
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr "快照不允许循环。"
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr "备份 image_type 要求循环参数。"
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr "密钥对 %(key_name)s 已经存在。"
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr "用户 %(user)s 已存在。"
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr "LDAP用户 %(user)s 已经存在。"
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr "LDAP用户组 %(group)s 已经存在。"
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr "用户 %(uid)s 已经是 组 %(group_dn)s 中的成员"
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr "项目 %(project)s 已经存在。"
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "实例 %(name)s 已经存在。"
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr "实例类型 %(name)s 已经存在。"
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr "卷类型 %(name)s 已经存在。"
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr "迁移错误"
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "错误格式的消息体： %(reason)s"
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "在 %(path)s 找不到配置文件。"
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr "调整时实例的大小必须要发生变化。"
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr "镜像比实例类型所允许的大。"
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr "1个或多个区域无法完成请求。"
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr "实例类型的内存对于所请求的镜像太小。"
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr "实例类型的磁盘对于所请求的镜像太小。"
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "没有足够的可用内存来启动计算节点  %(uuid)s。"
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "无法获取此主机的带宽、CPU和磁盘指标。"
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "找不到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr "主机 %(host)s 没有启动或者不存在。"
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr "超出配额"
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, fuzzy, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, fuzzy, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr "所选择主机的最大数目(%d)"
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr "超过个性化文件限制"
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr "个性化文件路径太长"
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr "个性化文件内容太长"
+
+#: nova/exception.py:997
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "找不到聚合 %(aggregate_id)s。"
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "聚合 %(aggregate_name)s 已经存在。"
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "聚合 %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "聚合 %(aggregate_id)s 没有键为 %(metadata_key)s 的元数据。"
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr "主机 %(host)s 已经是另外一个聚合的成员。"
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。"
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, fuzzy, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr "检测到不止一个名称为 %(vol_name) 的卷。"
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr "无法创建名称为 %(name)s 规格为 %(extra_specs)s 的卷类型。"
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr "无法创建实例类型。"
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr "来自SolidFire API的错误响应"
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr "SolidFire API响应里发生错误：status=%(status)s"
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr "SolidFire API响应里发生错误：data=%(data)s"
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "检测到已存在的id为%(vlan) vlan"
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, fuzzy, python-format
 msgid "Could not fetch image %(image)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "syslog设备必须作为一个 %s 。"
@@ -1108,364 +1150,365 @@ msgstr "在 %(full_task_name)s 期间发生的错误：%(e)s"
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "向调度器通报能力。"
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr "JSON文件表示策略。"
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr "请求的规则找不到时的检查缺省规则。"
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr "启动 %(topic)s 节点 (版本 %(vcs_string)s)"
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "为服务 %s 创建消费者"
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr "因无数据库记录，服务已被中止"
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr "服务数据库对象消失，正在重新创建。"
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr "与模型服务器(model server)的连接已恢复！"
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr "失去与模型服务器的连接"
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr "标记全集："
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr "%(flag)s：标记集合 "
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr "内层异常：%s"
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr "正在抓取 %s"
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr "发现未知的 utils.execute 关键字参数：%r"
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "正在运行cmd (subprocess)：%s"
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr "运行结果为 %s"
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r 失败，重试。"
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "运行cmd (SSH)：%s"
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr "SSH上不支持环境变量"
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr "SSH上不支持的进程输入参数。"
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr "回调中debug：%s"
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr "本地IP地址没有找到：%s"
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr "无法连接到 %(interface)s 的本地IP：%(ex)s"
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr "无效的后台：%s"
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr "后台 %s"
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr "循环调用中。"
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, fuzzy, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在试图获取信号量 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, fuzzy, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得信号量 \"%(lock)s\" 为方法 \"%(method)s\" ...锁"
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, fuzzy, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在 试图获取锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, fuzzy, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "获得文件锁 \"%(lock)s\" 为方法 \"%(method)s\"...锁"
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr "期望的对象类型：%s"
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr "不正确的server_string：%s"
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr "timefunc：'%(name)s' 用了%(total_time).2f 秒"
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
-msgstr "正在丢弃原来的异常。"
+#: nova/utils.py:1318
+#, fuzzy, python-format
+msgid "Reloading cached file %s"
+msgstr "正在删除基文件：%s"
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr "类 %(fullname)s 是不推荐的：%(msg)s"
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr "类 %(fullname)s 是不推荐的"
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr "函数 %(name)s 在%(location)s 里的是不推荐的：%(msg)s"
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr "函数 %(name)s 在%(location)s 里的是不推荐的"
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, fuzzy, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr "移除容器失败：%s"
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr "启动%(name)s 位置在 %(host)s:%(port)s"
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr "关闭WSGI服务器"
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr "WSGI服务器已经停止。"
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr "你必须执行 __call__"
 
+#: nova/wsgi.py:377
+#, fuzzy, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr "%(code)s: %(message)s"
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr "FaultWrapper: %s"
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr "认证失败过多"
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr "访问密钥 %(access_key)s 有错误 %(failures)d，认证失败将被锁定 %(lock_mins)d 分钟。"
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr "签名没有提供"
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr "访问密钥没有提供"
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr "与keystone交流失败"
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr "认证失败：%s"
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr "为%(uname)s:%(pname)s 验证通过的请求"
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr "执行: %s"
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr "arg: %(key)s\t\tval: %(value)s"
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr "为controller=%(controller)s 以及 action=%(action)s未验证的请求"
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr "引起异常 InstanceNotFound: %s"
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr "引起异常 VolumeNotFound: %s"
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr "引起异常 SnapshotNotFound: %s"
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr "引起异常 NotFound: %s"
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr "引起异常 EC2APIError: %s"
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr "引起异常 KeyPairExists: %s"
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr "引起异常 InvalidParameterValue: %s"
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr "引起异常 InvalidPortRange: %s"
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr "引起异常 NotAuthorized: %s"
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr "引起异常 InvalidRequest: %s"
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, fuzzy, python-format
 msgid "QuotaError raised: %s"
 msgstr "引起意外的错误：%s"
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr "引起意外的错误：%s"
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr "Environment: %s"
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "发生了一个未知的错误. 请重试你的请求."
 
@@ -1474,245 +1517,250 @@ msgstr "发生了一个未知的错误. 请重试你的请求."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "不支持的API请求：controller = %(controller)s，action = %(action)s"
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "创建卷 %s 的快照"
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, fuzzy, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr "参数GroupName的值 (%s) 无效。内容仅限于含有字母数字的字符，空格，破折号和下划线。"
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, fuzzy, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr "参数GroupName的值 (%s) 无效。长度超过了上限255。"
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr "创建密钥对 %s"
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr "导入密钥 %s"
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr "删除密钥对 %s"
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "无效的"
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入口权限"
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "参数不够创建有效规则。"
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr "对给定的参数无特定规则。"
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授权 %s 安全组入口权限"
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "这条规则已经存在于组%s 中"
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 #, fuzzy, python-format
 msgid "Quota exceeded, too many security group rules."
 msgstr "添加安全组规则：%r"
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr "参数GroupName的值 (%s) 无效。内容仅限于含有字母数字的字符，空格，破折号和下划线。"
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr "参数GroupName的值 (%s) 无效。长度超过了上限255。"
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "获取实例 %s 控制台输出"
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "从快照 %s 创建卷"
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的卷"
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 #, fuzzy
 msgid "Delete Failed"
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "把卷 %(volume_id)s 附加到实例 %(instance_id)s 上位置在 %(device)s"
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 #, fuzzy
 msgid "Attach Failed."
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr "分离卷 %s"
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 #, fuzzy, python-format
 msgid "Detach Volume Failed."
 msgstr "分离卷 %s"
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "属性不支持: %s"
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr "分配地址"
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr "释放地址 %s"
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "把地址 %(public_ip)s 关联到实例 %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "取消地址 %s 的关联"
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr "镜像必须可用。"
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr "准备开始终止实例"
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr "重启实例 %r"
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr "准备停止实例"
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr "准备启动实例"
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr "解除镜像 %s 的注册"
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "用id %(image_id)s 注册镜像 %(image_location)s"
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr "用户或者组没有确定"
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr "仅仅支持组\"all\""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr "operation_type必须添加或者移除"
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "正在更新镜像 %s 的 publicity 属性"
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "无法在 %d 秒内停止实例"
@@ -1753,39 +1801,6 @@ msgstr "扩展%(ext_name)s：无法扩展资源 %(collection)s：没有那种资
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr "扩展资源的扩展 %(ext_name)s：%(collection)s"
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr "%(user_id)s 通过令牌 '%(token)s' 是找不到的"
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr "%(user_id)s 必须是 %(project_id)s 的管理员或者成员"
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr "认证请求必须针对root版本(例如 /v2)。"
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr "请求中找不到 %s"
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr "成功验证 '%s'"
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr "没有为提供的API密钥找到用户。"
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr "提供的API密钥有效，但并不是给用户 '%(username)s' 的。"
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr "limit 参数必须是整数"
@@ -1816,31 +1831,44 @@ msgstr "href %s 不包含版本"
 msgid "Image metadata limit exceeded"
 msgstr "超过镜像元数据限制"
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+#, fuzzy
+msgid "Invalid image metadata"
+msgstr "无效的元数据"
+
+#: nova/api/openstack/common.py:308
 #, fuzzy, python-format
 msgid "Converting nw_info: %s"
 msgstr "实例的network_info：|%s|"
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, fuzzy, python-format
 msgid "Converted networks: %s"
 msgstr "意外错误：%s"
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "'%(action)s' 针对处于 %(attr)s %(state)s 的实例是无法进行"
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr "实例针对 '%(action)s' 处于无效状态"
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "拒绝快照请求，快照当前未被激活"
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr "该时刻实例快照是不允许的。"
 
@@ -1849,57 +1877,57 @@ msgstr "该时刻实例快照是不允许的。"
 msgid "Loaded extension: %s"
 msgstr "加载的扩展：%s"
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr "Ext name: %s"
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Ext alias: %s"
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr "Ext 描述: %s"
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Ext 命名空间: %s"
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Ext updated: %s"
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "加载扩展发生异常：%s"
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr "正在加载扩展 %s"
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "调用扩展工厂 %s"
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "加载扩展 %(classpath)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr "加载扩展 %(ext_name)s 失败：%(exc)s"
@@ -1994,31 +2022,43 @@ msgstr "subclasses必须执行construct()!"
 msgid "Initializing extension manager."
 msgstr "正在初始化扩展管理员。"
 
+#: nova/api/openstack/compute/flavors.py:101
+#, fuzzy, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr "用户 %s 的签名无效"
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr "镜像没有找到。"
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr "不正确的请求主体格式"
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr "请求主体和URI不匹配"
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr "请求主体包含太多items"
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr "无效的元数据键"
 
@@ -2043,218 +2083,206 @@ msgstr "这个请求受到频率限制。"
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr "服务器不存在"
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr "元数据项目未找到"
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr "无效的服务器状态：%(status)s"
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr "无效的changes-since值"
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr "超过个性化文件限制"
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr "个性化文件路径太长"
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr "个性化文件内容太长"
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr "服务器名称不是字符串或者unicode"
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr "服务器名称是空串"
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 #, fuzzy
 msgid "Server name must be less than 256 characters."
 msgstr "密钥对名称长度必须在1到255个字符之间"
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr "错误的个性化格式：丢失 %s"
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr "损坏的个性化格式"
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr "个性化 %s 的内容无法解码"
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr "损坏的网络格式：网络 uuid 格式不正确 (%s)"
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr "不正确的固定 IP 地址(%s)"
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr "不允许重复的网络(%s)"
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr "错误的网络格式：丢失%s"
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr "错误的网络格式"
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr "Userdata 内容无法解码"
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr "accessIPv4 不是正确的IPv4格式"
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 #, fuzzy
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr "accessIPv4 不是正确的IPv4格式"
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr "服务器名称未定义"
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr "提供了无效的flavorRef。"
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr "无法找到请求的镜像"
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr "提供了无效的key_name。"
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+#, fuzzy
+msgid "HostId cannot be updated."
+msgstr "id不能是None"
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr "实例还没有调整大小。"
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr "confirm-resize中的错误 %s"
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr "revert-resize中的错误 %s"
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr "重启的参数'type'既不是HARD也不是SOFT"
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr "缺少重启的参数'type'"
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr "重启中错误 %s"
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr "无法找到请求的类型。"
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr "调整大小需要尺寸的改变。"
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr "错误格式的服务器实体"
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr "缺少属性imageRef"
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr "提供了无效的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr "缺少属性flavorRef"
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr "没有确定adminPass"
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr "无效的adminPass"
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr "无法解析元数据键/值对"
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr "调整大小请求中的属性'flavorRef'无效。"
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr "调整大小请求要求有属性'flavorRef'。"
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr "无效的请求主体"
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr "无法解析请求中的imageRef。"
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr "无法找到实例"
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr "无法找到用来重新创建的镜像"
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr "实体createImage需要属性name"
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr "无效的元数据"
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr "正在从查询语句中移除选项 '%(unk_opt_str)s'"
@@ -2330,7 +2358,6 @@ msgstr "createBackup的属性 'rotation'必须是整数"
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2424,32 +2451,33 @@ msgid "Flavor not found."
 msgstr "没有找到服务器。"
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr "没有请求主体"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr "池 %s 中已经没有浮动ip。"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr "没有更多的浮动ip。"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr "缺少参数 dict"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr "地址没有指定"
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr "没有固定ip与实例关联"
 
@@ -2478,23 +2506,23 @@ msgstr "把主机 %(host)s 设置为 %(state)s。"
 msgid "Setting host %(host)s to %(state)s."
 msgstr "把主机 %(host)s 设置为 %(state)s。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr "Describe-resource是只有管理员才能执行的功能。"
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr "没有找到主机"
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "密钥对名称长度必须在1到255个字符之间"
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr "密钥对 '%s' 已经存在。"
@@ -2546,115 +2574,124 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr "错误格式的 scheduler_hints 属性"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr "安全组id应该是整数"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "安全组id应该是整数"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr "安全组 %s 已经存在"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "安全组 %s 既不是字符串也不是unicode"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "安全组 %s 不能为空。"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr "父组id不是整数"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr "没有找到安全组 (%s)"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr "参数不够创建有效规则。"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr "这条规则已经存在于组%s 中"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr "父组id或者组id不是整数"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr "规则id不是整数"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr "没有指定安全组"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr "安全组名称不能是空"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+#, fuzzy, python-format
+msgid "start instance"
 msgstr "启动实例 %r"
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+#, fuzzy, python-format
+msgid "stop instance"
 msgstr "停止实例 %r"
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr "vol=%s"
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr "删除id为 %s 的卷"
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr "把卷 %(volume_id)s 附加到实例 %(server_id)s 的 %(device)s 设备上"
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, fuzzy, python-format
+msgid "Instance %s is not attached."
+msgstr "实例 %s：没有启动"
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr "删除id为 %s 的快照"
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr "为卷 %s 创建快照"
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr "试图实例化单例"
@@ -2666,268 +2703,281 @@ msgid ""
 "instead."
 msgstr "尝试删除组中最后一个成员，用删除组 %s 来代替。"
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr "查找用户：%r"
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr "访问密钥 %s 授权失败"
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr "使用用户名称来作为项目名称 (%s)"
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr "授权失败：没有此项目名称 %(pjid)s (user=%(uname)s)"
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr "授权失败：用户 %(uname)s 不是管理员，也不是项目 %(pjname)s 的成员"
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr "user.secret: %s"
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr "expected_signature: %s"
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr "签名: %s"
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr "用户 %s 的签名无效"
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr "host_only_signature: %s"
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr "必须指定项目"
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr "为用户 %(uid)s 添加角色 %(role)s 用户位置在%(pid)s 项目里"
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr "添加全局角色 %(role)s 给用户 %(uid)s"
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr "移除用户 %(uid)s 的角色 %(role)s 用户位置是在项目 %(pid)s 里"
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr "移除全局角色 %(role)s 对象是用户 %(uid)s"
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr "创建项目 %(name)s 通过管理员 %(manager_user)s"
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr "正在修改项目 %s"
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr "添加用户 %(uid)s 到项目%(pid)s"
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr "移除用户 %(uid)s 于项目 %(pid)s 中"
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr "删除项目 %s"
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr "已创建用户 %(rvname)s (admin: %(rvadmin)r)"
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr "删除用户 %s"
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr "修改用户 %s 的访问密钥"
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr "修改用户 %s 的私钥"
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr "将管理员状态设置为 %(admin)r 目的是针对用户 %(uid)s"
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr "没有 %s 项目的vpn数据"
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 #, fuzzy, python-format
 msgid "Instance type for vpn instances"
 msgstr "无效的实例类型 %(instance_type)s。"
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr "cloudpipe实例的启动脚本模板"
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr "网络地址已存入openvpn配置"
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr "子网掩码已存入openvpn配置"
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr "启动VPN %s"
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr "未指定计算宿主机"
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr "无法找到实例 %s 的宿主机"
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "超过实例的配额。您无法运行更多此类型的实例。"
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "超过实例的配额。您只能再运行 %s 个此类型的实例。"
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, fuzzy, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr "%(pid)s 已经超过配额，试图运行 %(min_count)s 个实例"
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr "%(pid)s 已经超过配额，试图设置 %(num_metadata)s 个元数据属性"
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
-msgstr "%(pid)s 已经超过配额，元数据属性键或值太长"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+#, fuzzy, python-format
+msgid "Metadata property key greater than 255 characters"
+msgstr "安全组 %s 不能比255个字符更长。"
+
+#: nova/compute/api.py:233
+#, fuzzy, python-format
+msgid "Metadata property value greater than 255 characters"
+msgstr "安全组 %s 不能比255个字符更长。"
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备运行 %s 个实例"
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr "为 %(pid)s/%(uid)s 向调度器发送创建命令"
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 #, fuzzy, python-format
 msgid "Going to try to soft delete instance"
 msgstr "准备尝试软删除实例 %s"
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 #, fuzzy, python-format
 msgid "No host for instance, deleting immediately"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 #, fuzzy, python-format
 msgid "Going to try to terminate instance"
 msgstr "准备尝试终止实例 %s"
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 #, fuzzy, python-format
 msgid "Going to try to stop instance"
 msgstr "准备尝试停止实例 %s"
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 #, fuzzy, python-format
 msgid "Going to try to start instance"
 msgstr "准备尝试启动实例 %s"
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr "实例 %(instance_uuid)s 没有停止。(%(vm_state)s"
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr "搜索条件： %s"
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr "无法识别镜像类型 %s"
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。假定在迁移。"
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr "旧的实例类型 %(current_instance_type_name)s，新的实例类型 %(new_instance_type_name)s"
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr "存在多个固定IP，使用第一个：%s"
@@ -2946,88 +2996,79 @@ msgstr "数据库错误：%s"
 msgid "Instance type %s not found for deletion"
 msgstr "未找到要删除的实例类型 %s"
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr "check_instance_lock: decorating: |%s|"
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, fuzzy, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 "check_instance_lock: arguments: |%(self)s| |%(context)s| "
 "|%(instance_uuid)s|"
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr "check_instance_lock: 锁定: |%s|"
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr "check_instance_lock: admin: |%s|"
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr "check_instance_lock: 执行中: |%s|"
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr "check_instance_lock:  未执行 |%s|"
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr "无法加载虚拟驱动：%s"
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "当前状态是 %(drv_state)s，数据库状态是 %(db_state)s。"
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute重启后，实例正在重启。"
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "虚拟机管理程序驱动不支持防火墙规则"
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr "正在检查状态"
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "正在设置 bdm %s"
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-#, fuzzy, python-format
-msgid "Exception encountered while terminating the instance"
-msgstr "终止实例 %(instance_uuid)s 时发生异常"
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 #, fuzzy
 msgid "Instance not found."
 msgstr "没有找到实例"
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr "实例已经创建"
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, python-format
 msgid ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
@@ -3036,7 +3077,7 @@ msgstr ""
 "image_id=%(image_id)s, image_size_bytes=%(size_bytes)d, "
 "allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:530
+#: nova/compute/manager.py:526
 #, python-format
 msgid ""
 "Image '%(image_id)s' size %(size_bytes)d exceeded instance_type allowed "
@@ -3045,306 +3086,300 @@ msgstr ""
 "镜像 '%(image_id)s'  的大小为 %(size_bytes)d ，超过实例类型 instance_type 所允许的大小 "
 "%(allowed_size_bytes)d"
 
-#: nova/compute/manager.py:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr "正在启动虚拟机"
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr "实例跳过网络分配"
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr "实例网络设置失败"
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "实例的network_info：|%s|"
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr "实例块设备设置失败"
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 实例"
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s。把实例的 vm_state设置为ERROR"
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 #, fuzzy, python-format
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr "无法重建实例 [%(instance_uuid)s]，因为给定的镜像不存在。"
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, fuzzy, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr "无法重新创建实例 [%(instance_uuid)s]: %(exc)s"
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 #, fuzzy, python-format
 msgid "Rebuilding instance"
 msgstr "正在重新创建实例 %s"
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 #, fuzzy, python-format
 msgid "Rebooting instance"
 msgstr "正在重启虚拟机 %s"
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr "试图重启一个没有运行的实例：%(instance_uuid)s (状态：%(state)s 预计：%(running)s)"
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr "实例 %s: 快照中"
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr "试图为一个没有运行的实例快照：%(instance_uuid)s (状态：%(state)s 预计：%(running)s)"
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "找到 %(num_images)d 个镜像 (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮换出%d个备份"
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜像 %s"
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管理员密码失败。实例 %s 没有运行"
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 #, fuzzy, python-format
 msgid "Root password set"
 msgstr "实例 %s：Root密码已设置"
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr "该驱动不能执行set_admin_password。"
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr "设置管理员密码出错"
 
-#: nova/compute/manager.py:1085
-#, python-format
+#: nova/compute/manager.py:1106
+#, fuzzy, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 "试图把一个文件注入到没有运行的实例：%(instance_uuid)s (状态: %(current_power_state)s 预计: "
 "%(expected_state)s)"
 
-#: nova/compute/manager.py:1090
-#, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
-msgstr "实例 %(instance_uuid)s：把文件注入 %(path)s"
+#: nova/compute/manager.py:1110
+#, fuzzy, python-format
+msgid "injecting file to %(path)s"
+msgstr "注入文件路径：'%s'"
 
-#: nova/compute/manager.py:1104
-#, python-format
+#: nova/compute/manager.py:1124
+#, fuzzy, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 "试图更新没有运行的实例上的代理：%(instance_uuid)s (状态: %(current_power_state)s 预计: "
 "%(expected_state)s)"
 
-#: nova/compute/manager.py:1109
-#, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
-msgstr "实例 %(instance_uuid)s：正在把代理更新到 %(url)s"
+#: nova/compute/manager.py:1128
+#, fuzzy, python-format
+msgid "updating agent to %(url)s"
+msgstr "把代理更新为 %s"
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
-msgstr "实例 %s：正在救援中"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
+msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+#, fuzzy, python-format
+msgid "Unrescuing"
 msgstr "实例 %s：取消救援"
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr "目标与来源一样。"
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
-msgstr "实例 %s：正在迁移"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
+msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
-msgstr "实例 %s: 暂停"
+#: nova/compute/manager.py:1518
+#, fuzzy
+msgid "Pausing"
+msgstr "正在更新。"
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
-msgstr "实例 %s: 取消暫停"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
+msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+#, fuzzy, python-format
+msgid "Retrieving diagnostics"
 msgstr "实例 %s ：获取诊断"
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+#, fuzzy, python-format
+msgid "Suspending"
 msgstr "实例 %s：挂起"
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
-msgstr "实例 %s: 恢复中"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
+msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
-msgstr "实例%s:锁定中"
+#: nova/compute/manager.py:1619
+msgid "Locking"
+msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
-msgstr "实例%s:取消锁定"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
+msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+#, fuzzy, python-format
+msgid "Getting locked state"
 msgstr "实例%s：获取锁定的状态"
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
-msgstr "实例%s:重置网络"
+#: nova/compute/manager.py:1647
+#, fuzzy
+msgid "Reset network"
+msgstr "重置网络"
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+#, fuzzy, python-format
+msgid "Inject network info"
 msgstr "实例 %s：注入网络信息"
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+#, fuzzy, python-format
+msgid "Get console output"
+msgstr "获取实例 %s 控制台输出"
+
+#: nova/compute/manager.py:1699
+#, fuzzy, python-format
+msgid "Getting vnc console"
 msgstr "实例 %s：正在获得VNC控制台"
 
-#: nova/compute/manager.py:1693
+#: nova/compute/manager.py:1727
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
 
-#: nova/compute/manager.py:1711
-#, fuzzy, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
-msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
-
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, fuzzy, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
-msgstr "%(mountpoint)s 附加失败，移除中"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
+msgstr "卷 %(volume_id)s 正在 %(mountpoint)s 上启动"
 
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr "%(mountpoint)s 附加失败，移除中"
+#: nova/compute/manager.py:1764
+#, fuzzy, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "正在把卷 %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "卷 %(volume_id)s 从挂载点 %(mp)s 分离"
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
 msgstr "从未知实例%s中分离卷"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr "创建tmpfile %s 来通知其他的计算节点需要挂载相同的存储。"
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr "实例没有卷。"
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr "plug_vifs() 失败%(cnt)d 次。最多重新尝试 %(max_retry)d 次在主机 %(hostname)s。"
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr "预在线迁移在%(dest)s失败"
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr "post_live_migration()已经启动。"
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
@@ -3353,12 +3388,12 @@ msgstr ""
 "在线迁移：意外的错误：无法继承浮动ip。\n"
 "%(e)s"
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr "把实例迁移到 %(dest)s 成功完成。"
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -3366,94 +3401,92 @@ msgstr ""
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。”这个错误可以放心的忽略。"
 
-#: nova/compute/manager.py:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr "迁移后操作启动"
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr "更新主机状态"
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr "在数据库中找到 %(num_db_instances)s个实例，在虚拟机管理程序找到 %(num_vm_instances)s 个实例。"
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 #, fuzzy, python-format
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr "数据库中发现实例 %(name)s ，但是虚拟机管理程序不知道。设置加电状态为NOSTATE"
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..."
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的实例"
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, fuzzy, python-format
 msgid ""
 "Detected instance with name label '%(name)s' which is marked as DELETED "
 "but still present on host."
 msgstr "检测标签名为 '%(name_label)s' 的实例，这些实例被标识为DELETED却仍然存在于主机上。"
 
-#: nova/compute/manager.py:2473
+#: nova/compute/manager.py:2503
 #, fuzzy, python-format
 msgid ""
 "Destroying instance with name label '%(name)s' which is marked as DELETED"
 " but still present on host."
 msgstr "销毁标签名为 '%(name_label)s' 的实例，这些实例被标识为DELETED却仍然存在于主机上。"
 
-#: nova/compute/manager.py:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr "无法识别的FLAGS.running_deleted_instance_action的取值 '%(action)s'"
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr "聚合 %(aggregate_id)s已经有主机 %(host)s。"
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr "遗留的网络信息 nw_info 要求使用 IPv4 子网"
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr "正在添加控制台"
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr "尝试删除不存在的控制台%(console_id)s。"
@@ -3498,17 +3531,17 @@ msgstr "重启xvp"
 msgid "xvp not running..."
 msgstr "xvp不在运行中"
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr "删除过期令牌：(%s)"
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr "接收到令牌：%(token)s, %(token_dict)s)"
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr "检查令牌：%(token)s, %(token_valid)s)"
@@ -3517,143 +3550,105 @@ msgstr "检查令牌：%(token)s, %(token_valid)s)"
 msgid "Use of empty request context is deprecated"
 msgstr "使用空的请求上下文是不推荐的"
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr "无法识别的 read_deleted 取值”%s“"
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr "主机 %(host)s 没有计算节点"
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr "没有id为%(sm_backend_id)s的后台配置"
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr "没有 sm_flavor 调用 %(sm_flavor)s"
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr "没有id为 %(volume_id)s 的 sm_volume"
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
-msgstr "没有安装 python-migrate。正退出。"
-
-#: nova/db/sqlalchemy/migration.py:78
+#: nova/db/sqlalchemy/migration.py:74
 msgid "version should be an integer"
 msgstr "version应该是整数"
 
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
+msgstr ""
+
 #: nova/db/sqlalchemy/session.py:137
 #, fuzzy, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr "SQL连接失败 (%(connstring)s)。还剩 %(attempts)d 次。"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr "interface 列没有加入networks 表中"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr "表 |%s| 没有创建"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr "VIF 列没有加入到 fixed_ips 表中"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr "为移动 mac_addresses |%s| 加入列表"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr "外键约束无法添加"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr "外键约束无法删除"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
-msgstr "priority列没有加入到 networks 表中"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#, fuzzy
+msgid "quota_classes table not dropped"
+msgstr "instance_info_caches 没有删除掉"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr "外键约束无法去除"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr "progress列没有加入到实例表中"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr "无法把 flavorid 转化为整数：%s。设置 flavorid 成类似整数的字符串来降级。"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
-msgstr "instance_info_caches 没有删除掉"
-
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
-msgstr "progress 列没有加入到 compute_nodes 表中"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+#, fuzzy
+msgid "Foreign Key constraint couldn't be removed"
+msgstr "外键约束无法去除"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
-msgstr "dns_domains 表没有删除"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+#, fuzzy
+msgid "foreign key could not be dropped"
+msgstr "外键约束无法删除"
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
 #, fuzzy
-msgid "quota_classes table not dropped"
-msgstr "instance_info_caches 没有删除掉"
+msgid "foreign key could not be created"
+msgstr "外键约束无法去除"
 
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr "glance服务器连接错误，重试中"
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr "达到最大尝试次数"
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr "正在Glance中创建镜像。元数据 %s 已经传入。"
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr "为Glance 进行格式化后的元数据 %s"
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr "从Glance返回的为Base格式化的元数据 %s"
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr "不是镜像所有者"
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr "%(timestamp)s 没有遵循任何签名格式：%(iso_formats)s"
@@ -3712,117 +3707,122 @@ msgstr "错误的to_global_ipv6前缀：%s"
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr "错误的to_global_ipv6 oject_id；%s"
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr "驱动仅支持入口类型 'a'。"
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "试图移除不存在的链 %s。"
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "未知链：%r"
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr "试图移除不存在的规则：%(chain)r %(rule)r %(wrap)r %(top)r"
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr "IPTablesManager.apply成功完成"
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr "挂起进程 dnsmasq 时抛出 %s"
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr "Pid %d 过期了，重新启动dnsmasq"
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr "杀掉进程 radvd 时抛出 %s"
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr "Pid %d 过期了，重新启动radvd"
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr "正在开启VLAN接口 %s"
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr "正在为 %s 开启桥接口"
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, fuzzy, python-format
+msgid "Failed to add interface: %s"
+msgstr "挂起实例失败"
+
+#: nova/network/linux_net.py:1148
 #, fuzzy, python-format
 msgid "Starting bridge %s "
 msgstr "保证桥 %s"
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, fuzzy, python-format
 msgid "Done starting bridge %s"
 msgstr "保证桥 %s"
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, fuzzy, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr "移除实例”%s“的虚拟网络设备时失败"
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, fuzzy, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr "证书 %(certificate_id)s 没有找到。"
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr "没有找到接口 %(interface)s"
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr "为实例 |%s| 分配浮动IP"
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr "为实例 |%s| 释放浮动IP"
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr "地址 |%(address)s| 没有分配"
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr "地址 |%(address)s| 没有分配给你的项目 |%(project)s|"
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr "%s 的配额超出，尝试分配地址"
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3830,117 +3830,117 @@ msgid ""
 "ignored."
 msgstr "数据库不一致：DNS域|%s| 在Nova数据库中注册，但是对浮动或者实例DNS驱动均不可见。将被忽略。"
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr "域 |%(domain)s| 已经存在，把区域改变为 |%(av_zone)s|。"
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr "域 |%(domain)s| 已经存在，把项目改变为 |%(project)s|。"
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr "解除 %s 过期固定ip的关联"
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr "设置网络主机"
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr "为实例 |%s| 的网路分配"
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr "为实例 |%(instance_id)s| 获取的网络：|%(networks)s|"
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr "为实例 |%s| 解除网络分配"
 
-#: nova/network/manager.py:1149
-#, python-format
+#: nova/network/manager.py:1175
+#, fuzzy, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 "instance-dns-zone是 |%(domain)s|，该域位于区域 |%(zone)s| 中。实例|%(instance)s| 在区域 "
 "|%(zone2)s| 里。没有DNS记录将创建。"
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr "租用的IP |%(address)s|"
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr "没有关联的IP %s 被租用了"
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr "没有分配的IP |%s| 被租用了"
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr "释放的IP |%(address)s|"
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr "没有关联的IP %s 被释放了"
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr "没有租用的IP %s 被释放了"
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr "cidr 已经在使用"
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的超网络 (%(super)s) 冲突"
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr "请求的cidr (%(cidr)s) 与已存在的较小的cidr (%(smaller)s) 冲突"
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr "网络已经存在。"
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr "网路在删除前必须与项目 %s 解除关联"
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr "网络数量与VLAN起始数之和不能大于4049"
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3980,54 +3980,54 @@ msgstr "无法连接到服务器。出现错误：%s"
 msgid "unable to deserialize object of type = '%s'"
 msgstr "无法反序列化type = '%s' 的对象"
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr "QuantumManager 没有使用 'multi_host' 参数。"
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr "QuantumManager 要求每次调用仅创建一个网落。"
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr "QuantumManager 没有使用 'vlan_start' 参数。"
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr "QuantumManager 没有使用 'vpn_start' 参数。"
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr "QuantumManager 没有使用 'bridge' 参数。"
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr "QuantumManager 没有使用 'bridge_interface' 参数。"
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr "QuantumManager 要求一个有效的 (.1) 网关地址。"
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr "无法为租户 '%(q_tenant_id)s' 找到已存在的 net-id是 '%(quantum_net_id)s' 的quantum网络"
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr "实例 %s 的网络分配"
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr "实例的端口取消分配失败：|%(instance_id)s|, port_id: |%(port_id)s|"
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4081,73 +4081,73 @@ msgstr "将连接接口 %(interface_id)s 连接到net %(net_id)s 针对租户 %(
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr "端口 %(port_id)s 在net %(net_id)s 上删除，针对租户是 %(tenant_id)s"
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr "%s 不在有效的优先级"
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr "Problem '%(e)s' 试图发送到通知系统。Payload=%(payload)s"
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr "Problem '%(e)s' 试图发送到通知驱动 %(driver)s。"
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr "未打包的上下文：%s"
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr "已接收 %s"
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr "没有适用于消息的方法：%s"
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr "没有适用于消息的方法：%s"
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr "在 %s 做异步call"
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "消息ID(MSG_ID)是 %s"
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "在 %s 做异步cast"
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr "做异步fanout cast"
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -4156,16 +4156,16 @@ msgstr ""
 "远程错误：%(exc_type)s %(value)s\n"
 "%(traceback)s。"
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr "等待RPC响应返回超时"
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "返回 %s 异常给调用者"
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4195,41 +4195,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr "位于%(hostname)s:%(port)d的AMQP服务器不可达：%(err_str)s。%(sleep_time)d 秒钟后请再尝试。"
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr "为topic '%(topic)s'声明消费者失败：%(err_str)s"
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr "等待RPC响应超时：%s"
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr "从队列中消费消息失败：%s"
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr "给topic '%(topic)s'发布消息失败：%(err_str)s"
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, fuzzy, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr "无法连接到AMQP服务器：%s "
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr "连接到 %s 的AMQP服务器"
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr "重建AMQP队列"
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4242,60 +4242,60 @@ msgstr "正确的服务在运行吗？"
 msgid "Could not find another compute"
 msgstr "无法找到另一个计算节点"
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr "把“%(method)s”投放在卷%(host)s\""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr "把“%(method)s”投放在主机 \"%(host)s\""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr "把“%(method)s”投放在网络 \"%(host)s\""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr "把“%(method)s”投放在 %(topic)s \"%(host)s\""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr "必须实现一个回滚 schedule"
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "块存储迁移无法在共享存储使用"
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr "主机 %(dest)s 和原先的主机 %(src)s 不兼容。"
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr "无法迁移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4362,21 +4362,21 @@ msgstr "host_manager 只实现了“compute”"
 msgid "No service for compute ID %s"
 msgstr "计算节点 %s 没有服务"
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, fuzzy, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr "驱动方法 %(driver_method)s 丢失：%(e)s。撤销回schedule()"
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, fuzzy, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状态"
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4421,29 +4421,29 @@ msgstr "伪命令引起异常 %s"
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr "伪命令的标准输出stdout='%(stdout)s' 标准错误输出 stderr='%(stderr)s'"
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr "请扩展模拟的 libvirt 模块来支持标记"
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr "请扩展伪libvirt模块来支持这种认知方法"
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr "正在运行的实例：%s"
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "终止实例之后：%s"
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr "内部错误"
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "强制杀死实例后：%s"
@@ -4493,12 +4493,12 @@ msgstr "项目"
 msgid "uuid"
 msgstr "uuid"
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr "目标 %s 已经分配"
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr "无法确认导出的卷 id：%s。"
@@ -4513,20 +4513,19 @@ msgstr "给定数据：%s"
 msgid "Result data: %s"
 msgstr "结果数据：%s"
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "在%s 创建文件模拟客户代理"
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "移除在 %s 的模拟的客户代理文件"
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, fuzzy, python-format
-msgid "Quota exceeded: code=%(code)s"
-msgstr "超出配额"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
+msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
 #, python-format
@@ -4548,32 +4547,32 @@ msgstr "_get: %s"
 msgid "_get_all: %s"
 msgstr "_get_all: %s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr "test_snapshot_create: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr "test_snapshot_create: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr "test_snapshot_create_force: param=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr "test_snapshot_create_force: resp_dict=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr "test_snapshot_show: resp=%s"
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr "test_snapshot_detail: resp_dict=%s"
@@ -4635,21 +4634,21 @@ msgstr "意外的状态码"
 msgid "Decoding JSON: %s"
 msgstr "解码JSON：%s"
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr "嵌套(调用)接收到 %(queue)s, %(value)s"
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr "嵌套(调用)返回 %s"
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr "RPC后台不支持超时"
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
@@ -4658,26 +4657,25 @@ msgstr "已接收 %s"
 msgid "Failed to open connection to the hypervisor"
 msgstr "打开虚拟机管理程序的连接失败"
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr "Compute_service记录为 %s 创建 "
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr "Compute_service记录为 %s 更新 "
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
-msgstr "试图不过滤没有过滤的实例 %s"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
+msgstr "试图不过滤没有过滤的实例"
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+#, fuzzy, python-format
+msgid "Filters added to instance"
 msgstr "过滤器添加给实例 %s"
 
 #: nova/virt/firewall.py:139
@@ -4689,7 +4687,7 @@ msgstr "提供者防火墙规则刷新"
 msgid "Adding security group rule: %r"
 msgstr "添加安全组规则：%r"
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr "添加提供者规则：%s"
@@ -4714,27 +4712,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr "针对useconnection_type=vmwareapi必须指定vmwareapi_host_ip,vmwareapi_host_username和vmwareapi_host_password"
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "在vmwareapi：_create_session，得到这个异常：%s"
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "在vmwareapi：_call_method，得到这个异常：%s"
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "任务 [%(task_name)s] %(task_ref)s 状态：成功"
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "任务 [%(task_name)s] %(task_ref)s 状态：错误 %(error_info)s"
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "在vmwareapi：_poll_task，得到这个错误 %s"
@@ -4862,99 +4860,99 @@ msgstr "实例 %(instance_name)s：正在删除实例文件 %(target)s"
 msgid "instance %s: rebooted"
 msgstr "实例 %s：重启"
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr "_wait_for_reboot失败"
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr "实例 %s：已救援"
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr "_wait_for_rescue 失败"
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr "<============= 生产裸机=============>"
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr "实例 %s：正在创建中"
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr "已经注入密钥但是实例还没有运行"
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr "实例 %s：已启动"
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr "~~~~~~ 当前状态 = %s ~~~~~~"
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr "实例 %s 生产成功"
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr "实例 %s：没有启动"
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr "过多提交裸机分配"
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr "实例 %s：正在创建镜像"
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr "实例 %(inst_name)s：将 %(injection)s 注入镜像 %(img_id)s"
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr "实例 %(inst_name)s：忽略向镜像 %(img_id)s 注入数据的错误 (%(e)s)"
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr "实例 %s：开始方法 toXML"
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr "实例 %s：方法toXML 完成"
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr "无法得到CPU的数目，因为这个函数不是给这个平台执行的。这个错误可以被放心忽略。"
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr "#### RLK: cpu_arch = %s "
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr "正在更新。"
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr "正在更新主机状态"
@@ -5006,32 +5004,32 @@ msgstr "节点处于未知的错误状态。"
 msgid "no capable image handler configured"
 msgstr "没有合适的镜像句柄配置好"
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr "未知的磁盘镜像句柄：%s"
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr "镜像已经挂载"
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr "挂载文件系统失败：%s"
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr "移除容器失败：%s"
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -5050,11 +5048,17 @@ msgstr "未知的guestmount错误"
 msgid "Could not attach image to loopback: %s"
 msgstr "无法给loopback附加镜像：%s"
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, fuzzy, python-format
+msgid "partition %s not found"
 msgstr "未找到分区"
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr "映射分区失败：%s"
@@ -5077,180 +5081,180 @@ msgstr "qemu-nbd 错误：%s"
 msgid "nbd device %s did not show up"
 msgstr "nbd 设备 %s 没有出现"
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr "连接 libvirt 失败"
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "销毁时发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr "删除已保存的实例时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr "实例销毁成功。"
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, fuzzy, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt 发生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr "删除实例文件 %(target)s"
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator名字"
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr "附加 LXC 块设备"
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr "分离LXC 块设备"
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "重新启动实例失败"
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr "重启过程中，实例消失。"
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr "实例成功重启。"
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr "发现 %(migration_count)d 个超过 %(confirm_window)d 秒未经确认的迁移"
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr "正在自动确认迁移 %d"
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr "实例在运行"
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 #, fuzzy
 msgid "During spawn, instance disappeared."
 msgstr "重启过程中，实例消失。"
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr "实例成功生产。"
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "用户没有管理员权限"
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr "正在创建镜像"
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr "将 %(injection)s 注入到镜像 %(img_id)s"
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr "忽略向镜像 %(img_id)s  注入的数据的错误 (%(e)s)"
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr "块设备列表 block_device_list %s"
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr "正在启动 toXML 方法"
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr "toXML方法完成"
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr "查找 %(instance_name)s时libvirt出错：[错误代码 %(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(不支持getVersion)"
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr "'<cpu>' 必须为 1, 但是为 %d\n"
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr "拓扑 (%(topology)s) 必须含有 %(ks)s"
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -5259,7 +5263,7 @@ msgstr ""
 "已启动实例的CPU信息：\n"
 "%s"
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5274,44 +5278,44 @@ msgstr ""
 "\n"
 "参考 %(u)s"
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr "迁移 %s 超时"
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr "因它像卷，所以跳过 %(path)s"
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+#, fuzzy, python-format
+msgid "Starting migrate_disk_and_power_off"
 msgstr "实例 %s：开始执行 migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 #, fuzzy, python-format
 msgid "During wait running, instance disappeared."
 msgstr "%s 在运行中消失了。"
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 #, fuzzy, python-format
 msgid "Instance running successfully."
 msgstr "实例 %s 成功运行。"
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+#, fuzzy, python-format
+msgid "Starting finish_migration"
 msgstr "实例 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+#, fuzzy, python-format
+msgid "Starting finish_revert_migration"
 msgstr "实例 %s：开始执行 finish_revert_migration"
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5342,68 +5346,64 @@ msgstr "名称为 %(name)s 的nwfilter(%(instance_filter_name)s) 未找到。"
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables 防火墙：设置基本的过滤规则"
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr "试图不过滤没有过滤的实例"
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr "%s 是一个正确的实例名称"
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr "%s 有一个磁盘文件"
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr "实例 %(instance)s  由文件 %(backing)s 来备份"
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr "实例 %(instance)s 正在使用的备份文件 %(backing)s 没有出现在镜像服务里。"
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像验证失败"
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像验证跳过，没有散列存储"
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, fuzzy, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr "基文件太新不需要删除：%s"
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr "正在删除基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr "删除 %(base_file)s 失败，错误是 %(error)s"
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：正在检查中"
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, fuzzy, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
@@ -5412,7 +5412,7 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s)：正在使用中：本地节点 %(local)d, 远程节点 "
 "%(remote)d"
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, fuzzy, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
@@ -5421,76 +5421,101 @@ msgstr ""
 "%(container_format)s-%(id)s (%(base_file)s)：警告 -- 使用中缺少基文件! 实例： "
 "%(instance_list)s"
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：在使用中： 在远程节点 (%(remote)d 上"
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像不在使用中"
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, fuzzy, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr "%(container_format)s-%(id)s (%(base_file)s)：镜像在使用中"
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr "跳过验证，在 %s 上没有基础目录"
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr "验证基础镜像"
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr "未知的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr "活跃的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr "损坏的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr "可删除的基文件：%s"
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr "确认完成"
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr "无法找到一个开放端口"
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, fuzzy, python-format
+msgid "Reading image info file: %s"
+msgstr "正在删除基文件：%s"
+
+#: nova/virt/libvirt/utils.py:364
+#, fuzzy, python-format
+msgid "Read: %s"
+msgstr "_create: %s"
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, fuzzy, python-format
+msgid "Writing image info file: %s"
+msgstr "正在删除基文件：%s"
+
+#: nova/virt/libvirt/utils.py:395
+#, fuzzy, python-format
+msgid "Wrote: %s"
+msgstr "重写%s"
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "保证vlan %(vlan)s 和桥 %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "保证桥 %s"
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+#, fuzzy, python-format
+msgid "Failed while unplugging vif"
 msgstr "移除实例”%s“的虚拟网络设备时失败"
 
 #: nova/virt/libvirt/volume.py:163
@@ -5521,33 +5546,33 @@ msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
 #: nova/virt/vmwareapi/fake.py:131
-#, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+#, fuzzy, python-format
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "属性 %(attr)s 没有为管理对象 %(objName)s 设置"
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr "没有虚拟机注册"
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "ref 为 %s 的虚拟机不存在"
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "退出无效的会话或者已经退出了：%s"
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr "会话有错误"
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr "会话无效"
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr " 还没有虚拟机被注册"
 
@@ -5629,16 +5654,16 @@ msgid "Couldn't get a local Datastore reference"
 msgstr "无法得到本地的存储引用"
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+#, fuzzy, python-format
+msgid "Creating VM on the ESX  host"
 msgstr "在ESX主机上创建名为 %s 的虚拟机"
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+#, fuzzy, python-format
+msgid "Created VM on the ESX  host"
 msgstr "已经在ESX主机上创建名为 %s 的虚拟机"
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
@@ -5647,7 +5672,7 @@ msgstr ""
 "创建 %(vmdk_file_size_in_kb)s KB 大的虚拟磁盘和适配器类型 %(adapter_type)s 在ESX主机的本地存储 "
 "%(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5661,225 +5686,221 @@ msgid ""
 "%(data_store_name)s"
 msgstr "删除文件 %(flat_uploaded_vmdk_path)s 在ESX主机的本地存储 %(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr "删除文件 %(flat_uploaded_vmdk_path)s 在ESX主机的本地存储 %(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr "下载文件数据 %(image_ref)s 到ESX主机的数据存储 %(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr "已经下载镜像文件数据 %(image_ref)s 在ESX数据存储 %(data_store_name)s 上"
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+#, fuzzy, python-format
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr "正在重新配置虚拟机实例 %s 来附加镜像磁盘"
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+#, fuzzy, python-format
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr "已经重新配置虚拟机实例 %s 来附加于镜像磁盘"
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+#, fuzzy, python-format
+msgid "Powering on the VM instance"
 msgstr "正启动虚拟机实例 %s"
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+#, fuzzy, python-format
+msgid "Powered on the VM instance"
 msgstr "已经启动虚拟机实例 %s"
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+#, fuzzy, python-format
+msgid "Creating Snapshot of the VM instance"
 msgstr "正在创建虚拟机实例快照 %s "
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+#, fuzzy, python-format
+msgid "Created Snapshot of the VM instance"
 msgstr "已经创建虚拟机实例快照 %s "
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+#, fuzzy, python-format
+msgid "Copying disk data before snapshot of the VM"
 msgstr "正在快照虚拟机实例 %s 之前复制磁盘数据"
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+#, fuzzy, python-format
+msgid "Copied disk data before snapshot of the VM"
 msgstr "已经在快照虚拟机实例 %s 之前复制磁盘数据"
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr "上传镜像 %s"
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr "已经上传镜像  %s"
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr "正在删除临时的vmdk文件 %s"
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr "已经删除临时的vmdk文件 %s"
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr "实例未启动"
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+#, fuzzy, python-format
+msgid "Rebooting guest OS of VM"
 msgstr "正在重启虚拟机客户操作系统 %s"
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+#, fuzzy, python-format
+msgid "Rebooted guest OS of VM"
 msgstr "已经重启虚拟机客户操作系统 %s"
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+#, fuzzy, python-format
+msgid "Doing hard reboot of VM"
 msgstr "正在冷启动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+#, fuzzy, python-format
+msgid "Did hard reboot of VM"
 msgstr "已经冷启动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+#, fuzzy, python-format
+msgid "instance not present"
 msgstr "实例 - %s 不存在"
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+#, fuzzy, python-format
+msgid "Powering off the VM"
 msgstr "正在关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+#, fuzzy, python-format
+msgid "Powered off the VM"
 msgstr "关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+#, fuzzy, python-format
+msgid "Unregistering the VM"
 msgstr "正在注销虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+#, fuzzy, python-format
+msgid "Unregistered the VM"
 msgstr "已经注销虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr "注销虚拟机时在 vmwareapi:vmops:destroy 中发生异常：%s"
 
-#: nova/virt/vmwareapi/vmops.py:592
-#, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#: nova/virt/vmwareapi/vmops.py:599
+#, fuzzy, python-format
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr "正在删除虚拟机 %(name)s 的内容位置在数据存储 %(datastore_name)s 中"
 
-#: nova/virt/vmwareapi/vmops.py:602
-#, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#: nova/virt/vmwareapi/vmops.py:609
+#, fuzzy, python-format
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr "已经删除虚拟机 %(name)s 的内未知在数据存储 %(datastore_name)s 中"
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr "当从磁盘删除虚拟机的内容时在 vmwareapi:vmops:destroy 里发生异常：%s"
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr "vmwareapi 不支持暂停"
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr "vmwareapi 不支持取消暂停"
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+#, fuzzy, python-format
+msgid "Suspending the VM"
 msgstr "挂起虚拟机 %s "
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+#, fuzzy, python-format
+msgid "Suspended the VM"
 msgstr "已经挂起虚拟机 %s "
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr "实例已关闭，无法挂起。"
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+#, fuzzy, python-format
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr "虚拟机 %s 已经在挂起状态。不做任何操作直接返回"
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+#, fuzzy, python-format
+msgid "Resuming the VM"
 msgstr "正在恢复虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+#, fuzzy, python-format
+msgid "Resumed the VM"
 msgstr "已经恢复虚拟机 %s "
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr "实例不在挂起状态"
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics 没有在 vmwareapi 里实现"
 
-#: nova/virt/vmwareapi/vmops.py:757
-#, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+#: nova/virt/vmwareapi/vmops.py:765
+#, fuzzy, python-format
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr "正在重新配置实例 %(name)s 来设置机器的id为ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:765
-#, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+#: nova/virt/vmwareapi/vmops.py:773
+#, fuzzy, python-format
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr "已经重新配置虚拟机实例 %(name)s 来设置机器的id为ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "正在使用路径 %s 创建目录"
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr "已经创建路径为 %s 的目录"
@@ -5889,32 +5910,32 @@ msgstr "已经创建路径为 %s 的目录"
 msgid "Downloading image %s from glance image server"
 msgstr "正在从glance镜像服务器中下载镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr "已经从glance镜像服务器中下载镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr "正在向Glance镜像服务器上传镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr "已经向Glance镜像服务器上传了镜像 %s"
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr "正在获取镜像 %s 的大小"
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr "获得大小为 %(size)s 的镜像目的为了 %(image)s"
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
@@ -5923,44 +5944,58 @@ msgstr ""
 "针对use connection_type=xenapi必须指定xenapi_connection_url, "
 "xenapi_connection_username (可选) 和 xenapi_connection_password"
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, fuzzy, python-format
+msgid "Could not determine key: %s"
+msgstr "解密私钥失败：%s"
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr "不支持在XenServer启动主机"
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0磁盘是空么？)"
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr "产生 NotImplemented 错误"
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake 没有 %s 的实现"
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr "正在调用 %(localname)s %(impl)s"
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, fuzzy, python-format
+msgid "Calling setter %s"
+msgstr "调用 getter %s"
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -6053,57 +6088,57 @@ msgstr ""
 "网络 %(bridge)s 的 PIF %(pif_rec['uuid'])s  有VLAN id %(pif_vlan)d。期待的数目是 "
 "%(vlan_num)d"
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 #, fuzzy, python-format
 msgid "Created VM"
 msgstr "_create: %s"
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr "没有在实例 %s 找到VBD"
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, fuzzy, python-format
 msgid "VBD %s already detached"
 msgstr "已经分离"
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr "无法移除 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr "无法销毁 VBD %s"
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, fuzzy, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr "创建了VBD %(vbd_ref)s 目的是为了虚拟机 %(vm_ref)s，VDI %(vdi_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr "无法销毁 VDI %s"
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
@@ -6112,464 +6147,463 @@ msgstr ""
 "创建了 VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s) 位置在"
 " %(sr_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr "复制了 VDI %(vdi_ref)s ，对象来自VDI %(vdi_to_copy_ref)s ，位置在 %(sr_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr "克隆了 VDI %(vdi_ref)s 对象来自VDI %(vdi_to_clone_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, fuzzy, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr "未找到 %(vm_ref)s 的主VDI"
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, fuzzy, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr "正在为虚拟机 %(vm_ref)s 做快照，采用标签是 “%(label)s”"
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, fuzzy, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr "已经创建了快照 %(template_vm_ref)s 快照对象是虚拟机 %(vm_ref)s。"
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr "请求xapi 上传 %(vdi_uuids)s 作为镜像ID %(image_id)s"
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr "只能在ext类型的缺省本地存储库支持快速克隆。这个系统的存储库类型为 %(sr_type)s。忽略此 cow 标记。"
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr "请求 xapi 获取 vhd 镜像 %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr "xapi 'download_vhd' 返回“%(vdi_type)s”类型的VDI，其UUID为 “%(vdi_uuid)s”"
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr "image_size_bytes=%(size_bytes)d，allowed_size_bytes=%(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr "镜像大小 %(size_bytes)d 超过instance_type所允许的小大 %(allowed_size_bytes)d"
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, fuzzy, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr "获取镜像 %(image)s"
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, fuzzy, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr "镜像 %(image)s 的大小：%(virtual_size)d"
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr "内核/内存盘镜像太大：%(vdi_size)d 字节，最大 %(max_size)d 字节"
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr "将VDI %s 复制到dom0的/boot/guest下"
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr "内核/内存盘 VDI %s 已销毁"
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 #, fuzzy, python-format
 msgid "Failed to fetch glance image"
 msgstr "实例 %s：获取Glance镜像失败"
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr "检测到 %(image_type_str)s 格式，目标是镜像 %(image_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr "为PV内核查询vdi %s"
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr "未知的镜像格式 %(disk_image_type)s"
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr "VDI %s 依然可用"
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr "(VM_UTILS) xenserver 虚拟机状态 -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr "(VM_UTILS) xenapi power_state -> |%s|"
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr "重新扫描存储库 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr "标记sr_matching_filter '%s' 没有遵循格式要求"
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr "XenAPI无法找到安装客户实例的存储库。请检查你的配置或者配置标记'sr_matching_filter'"
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr "无法找到content-type ISO的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr "ISO：正在查看存储库 %(sr_rec)s"
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr "ISO：非iso内容"
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr "ISO：iso content_type，没有 'i18n-key' 键"
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr "ISO：iso content_type，i18n-key的值不是 'local-storage-iso'"
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr "ISO: 存储库符合标准"
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr "ISO: ISO, 正在查看是否是本地的主机"
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr "ISO: PBD %(pbd_ref)s 消失了"
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr "ISO: PBD匹配, 想要 %(pbd_rec)s, 目前有 %(host)s"
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr "ISO：含有本地PBD的存储库"
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr "无法为含服务器详细信息的虚拟机 %(vm_uuid)s 获取RRD XML：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr "无法获取包含服务器详细情况的RRD XML更新：%(server)s。"
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr "来自Xenserver无效的统计数据：%s"
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr "VHD %(vdi_uuid)s 有父 %(parent_ref)s"
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr "父标识 %(parent_uuid)s 和原先的父标识 %(original_parent_uuid)s 不匹配，正在等待合并..."
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr "VHD coalesce 将要超过(%(max_attempts)d)，放弃中..."
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr "等待设备 %s 创建超时"
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr "插入VBD %s... "
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr "插入VBD %s 完成。"
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr "VBD %(vbd_ref)s 作为 %(orig_dev)s 插入"
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr "VBD %(vbd_ref)s 插入错误的设备，重新映射为 %(dev)s"
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr "正在销毁VDI为 %s 的 VBD "
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr "已经销毁VDI为 %s 的 VBD"
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr "对 %s 运行pygrub"
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr "找到Xen内核 %s"
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr "没有找到Xen内核。正在启动HVM。"
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr "分区："
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr "  %(num)s: %(ptype)s %(size)d sectors"
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr "将分区表 %(primary_first)d %(primary_last)d 写入到 %(dev_path)s..."
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr "完成写入分区表 %s 。"
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr "安装在该镜像的XenServer工具可以进行网络注入。网络文件不会被操作。"
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr "该镜像有XenServer工具，但是不能进行网络注入"
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr "没有在该镜像上安装XenServer工具"
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr "直接操作接口文件"
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr "挂载文件系统失败(期望的是非Linux实例)：%s"
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, fuzzy, python-format
 msgid "Updating progress to %(progress)d"
 msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 #, fuzzy
 msgid "Starting instance"
 msgstr "正在启动虚拟机"
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr "从 dom0 中移除内核/内存盘文件"
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 #, fuzzy
 msgid "Failed to spawn, rolling back"
 msgstr "在数据库更新卷失败"
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 #, fuzzy, python-format
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr "正在自动配置实例 %(instance_uuid)s 的磁盘，尝试调整分区大小..."
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 #, fuzzy
 msgid "Starting VM"
 msgstr "重启xvp"
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr "%(hypervisor)s/%(os)s/%(architecture)s 最新的agent build 是 %(version)s 版本"
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr "没有找到 %(hypervisor)s/%(os)s/%(architecture)s 的代理创建"
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr "查询代理版本"
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr "实例代理版本：%s"
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr "把代理更新为 %s"
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, fuzzy, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr "injected_files无效的值：'%s'"
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr "设置管理员密码"
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr "重置网络"
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr "设置VCPU 权重"
 
-#: nova/virt/xenapi/vmops.py:582
-#, fuzzy
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, fuzzy, python-format
+msgid "Could not find VM with name %s"
 msgstr "找不到VDI ref"
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 #, fuzzy, python-format
 msgid "Finished snapshot and upload for VM"
 msgstr "快照完毕并为虚拟机 %s 上传"
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 #, fuzzy, python-format
 msgid "Starting snapshot for VM"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "无法为实例 %(instance_uuid)s 快照：%(exc)s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr "将 vhd 转移到新主机失败"
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr "将 VDI %(cow_uuid)s 由 %(old_gb)dGB 调小到  %(new_gb)dGB"
@@ -6614,42 +6648,42 @@ msgstr "更新密码失败：%(resp)r"
 msgid "Failed to inject file: %(resp)r"
 msgstr "注入文件失败：%(resp)r"
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 #, fuzzy, python-format
 msgid "VM already halted, skipping shutdown..."
 msgstr "虚拟机 %(instance_uuid)s 已经终止，跳过关闭..."
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr "无法为虚拟机找到VBD"
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 #, fuzzy, python-format
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr "实例 %(instance_uuid)s 使用RAW或者VHD，跳过内核和内存盘的删除"
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr "实例拥有内核或者内存盘，但不是二者均有"
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr "内核/内存盘文件移除了"
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 #, fuzzy
 msgid "Destroying VM"
 msgstr "重启xvp"
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr "虚拟机不存在，跳过销毁..."
 
@@ -6668,68 +6702,68 @@ msgstr "找到%(instance_count)d个超过%(timeout)d秒悬挂的重启"
 msgid "Automatically hard rebooting"
 msgstr "自动冷重启 %d"
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr "没有找到实例 %(instance_id)s"
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 #, fuzzy
 msgid "In ERROR state"
 msgstr "节点处于未知的错误状态。"
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr "无法得到带宽信息"
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 #, fuzzy, python-format
 msgid "Injecting network info to xenstore"
 msgstr "为虚拟机注入网络信息到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 #, fuzzy
 msgid "Creating vifs"
 msgstr "正在创建镜像"
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, fuzzy, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, fuzzy, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr "正在为虚拟机 %(vm_ref)s，网络 %(network_ref)s 创建VIF。"
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 #, fuzzy, python-format
 msgid "Injecting hostname to xenstore"
 msgstr "为虚拟机注入hostname到xs：|%s|"
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, fuzzy, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
@@ -6738,24 +6772,24 @@ msgstr ""
 "%(method)s 的代理调用返回无效的响应：%(ret)r。虚拟机id=%(instance_uuid)s; path=%(path)s; "
 "args=%(addl_args)r"
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, fuzzy, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr "超时：调用 %(method)s 超时。虚拟机id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr "没有执行：代理不支持 %(method)s 的调用。虚拟机id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "对 %(method)s 的调用返回错误：%(e)s。"
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL错误：%s"
@@ -6788,7 +6822,7 @@ msgid "introducing sr within volume_utils"
 msgstr "在volume_utils里引入sr"
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr "将 %(label)s 作为 %(sr_ref)s 引入。"
@@ -6801,11 +6835,11 @@ msgstr "为存储库创建pbd"
 msgid "Plugging SR"
 msgstr "插入存储库"
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr "无法引入存储库"
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr "无法得到使用uuid的存储库"
 
@@ -6873,101 +6907,101 @@ msgstr "无法获得目标信息 %(data)s, %(mountpoint)s"
 msgid "Mountpoint cannot be translated: %s"
 msgstr "挂载点无法被翻译：%s"
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr "找不到VDI ref"
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr "正在创建存储库 %s"
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr "无法创建存储库"
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr "无法获取存储库记录"
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr "引入存储库 %s"
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr "在xapi数据库找到存储库。无需引入。"
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr "无法引入存储库"
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr "检查存储库 %s"
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr "在xapi数据库没有找到存储库 %s"
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr "不能遗忘存储库"
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "无法在存储库 %(sr_ref)s 上为实例 %(instance_name)s 创建 VDI"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "存储库 %(sr_ref)s 不能为实例%(instance_name)s使用"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "无法附加卷到实例 %s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 附加到实例 %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "分离_volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "无法找到 %s 卷"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "无法分离 %s 卷"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr "无法销毁VBD %s"
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr "净化存储库 %s 出错"
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 从实例 %(instance_name)s 分离"
@@ -7104,117 +7138,117 @@ msgstr "RBD没有池 %s"
 msgid "Sheepdog is not working: %s"
 msgstr "Sheepdog 没有工作：%s"
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr "Sheepdog 没有工作"
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr "重新导出卷%s"
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr "卷 %s：跳过导出"
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr "卷 %s: 创建中"
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr "卷%(vol_name)s:创建大小为%(vol_size)s的逻辑卷"
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr "卷%s：正在创建导出"
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr "卷%s：创建成功"
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr "卷仍在附加中"
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr "卷不属于这个节点"
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr "卷%s：正在移除导出"
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr "卷%s：删除中"
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr "卷 %s：卷繁忙"
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr "卷%s：删除成功"
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr "快照 %s：正在创建"
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr "快照 %(snap_name)s：正在创建"
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr "快照 %s：创建成功"
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr "快照 %s：正在删除"
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, fuzzy, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr "快照 %s：创建成功"
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr "快照 %s：删除成功"
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr "检查卷能力"
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr "找到新能力：%s"
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr "清理能力"
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr "收到通知 {%s}"
@@ -7244,144 +7278,144 @@ msgstr "未知的基文件：%s"
 msgid "Failed to provision dataset member"
 msgstr "更新数据库失败"
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "无法为VDI %s 找到VBD"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "无法为卷 %s 找到 iSCSI 导出"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, fuzzy, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr "为ip： %s获取元数据失败"
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, fuzzy, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr "为ip： %s获取元数据失败"
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, fuzzy, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr "为ip： %s获取元数据失败"
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, fuzzy, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr "为ip： %s获取元数据失败"
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr "指定san_password或者san_private_key"
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr "san_ip必须设置"
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr "没有为 %(zfs_poolname)s 找到LUID。Output=%(out)s"
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr "返回CLIQ命令 %s"
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr "CLIQ命令 %(verb)s %(cliq_args)s 错误格式的响应。Result=%(out)s"
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr "在运行CLIQ命令 %(verb)s %(cliq_args)s 时发生错误。输出结果 Result=%(out)s"
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr "集群 %(cluster_name)s 有意外数量的虚拟 ip 地址。输出结果 Result=%(_xml)s"
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr "卷信息：%(volume_name)s => %(volume_attributes)s"
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr "不支持local_path"
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr "无法为卷 %s 确定项目，无法导出"
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr "SolidFire API 调用的参数：%s"
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr "调用 json.loads() 引起异常：%s"
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr "SolidFire API调用结果：%s"
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr "找到solidfire帐户：%s"
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr "solidfire帐户：%s 不存在，正在创建..."
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr "进入SolidFire create_volume..."
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr "离开SolidFire create_volume"
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr "进入SolidFire delete_volume..."
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, fuzzy, python-format
 msgid "Deleting volumeID: %s"
 msgstr "正在删除volumeID：%s "
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr "离开SolidFire delete_volume"
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr "正在执行SolidFire ensure_export..."
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr "正在执行SolidFire create_export..."
 
@@ -7435,36 +7469,36 @@ msgstr "到达后台 %d 失败"
 msgid "XenSMDriver requires xenapi connection"
 msgstr "XenSMDriver要求xenapi连接"
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr "初始化会话失败"
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr "卷会在后台创建 - %d"
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr "在数据库更新卷失败"
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr "无法创建卷"
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr "删除VDI失败"
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr "在数据库删除卷失败"
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr "没有在数据库找到卷"
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr "没有在数据库中找到后台(backend)"
 
@@ -7547,6 +7581,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr "此时的卷服务不可用。"
+
 #~ msgid "Nova access parameters were not specified."
 #~ msgstr "未指定Nova访问参数。"
 
@@ -7556,6 +7593,12 @@ msgstr ""
 #~ msgid "Virtual Storage Array %(name)s could not be found."
 #~ msgstr "无法找到虚拟存储阵列 %(name)s。"
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr "内层异常：%s"
+
+#~ msgid "Original exception being dropped"
+#~ msgstr "正在丢弃原来的异常。"
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr "正在停止裸TCP服务器。"
 
@@ -7568,6 +7611,27 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr "返回的non-serializeable类型：%s"
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr "%(user_id)s 通过令牌 '%(token)s' 是找不到的"
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr "%(user_id)s 必须是 %(project_id)s 的管理员或者成员"
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr "认证请求必须针对root版本(例如 /v2)。"
+
+#~ msgid "Could not find %s in request."
+#~ msgstr "请求中找不到 %s"
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr "成功验证 '%s'"
+
+#~ msgid "User not found with provided API key."
+#~ msgstr "没有为提供的API密钥找到用户。"
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr "提供的API密钥有效，但并不是给用户 '%(username)s' 的。"
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr "关联浮动ip失败"
 
@@ -7622,6 +7686,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr "为 VSA %s 索引实例"
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr "%(pid)s 已经超过配额，元数据属性键或值太长"
+
 #~ msgid "Creating a raw instance"
 #~ msgstr "正在创建裸实例"
 
@@ -7641,15 +7708,84 @@ msgstr ""
 #~ "context"
 #~ msgstr "数据库中不存在实例 %(instance_uuid)s，但是无论如何要用特殊上下文来关闭。"
 
+#~ msgid "exception terminating the instance %(instance_uuid)s"
+#~ msgstr "终止实例 %(instance_uuid)s 时发生异常"
+
 #~ msgid "Instance %s not found."
 #~ msgstr "未找到实例 %s"
 
 #~ msgid "trying to destroy already destroyed instance: %s"
 #~ msgstr "尝试销毁已经销毁的实例: %s"
 
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr "实例 %(instance_uuid)s：把文件注入 %(path)s"
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr "实例 %(instance_uuid)s：正在把代理更新到 %(url)s"
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr "实例 %s：正在救援中"
+
+#~ msgid "instance %s: migrating"
+#~ msgstr "实例 %s：正在迁移"
+
+#~ msgid "instance %s: pausing"
+#~ msgstr "实例 %s: 暂停"
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr "实例 %s: 取消暫停"
+
+#~ msgid "instance %s: resuming"
+#~ msgstr "实例 %s: 恢复中"
+
+#~ msgid "instance %s: locking"
+#~ msgstr "实例%s:锁定中"
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr "实例%s:取消锁定"
+
+#~ msgid "instance %s: reset network"
+#~ msgstr "实例%s:重置网络"
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr "%(mountpoint)s 附加失败，移除中"
+
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr "没有安装 python-migrate。正退出。"
+
+#~ msgid "interface column not added to networks table"
+#~ msgstr "interface 列没有加入networks 表中"
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr "VIF 列没有加入到 fixed_ips 表中"
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr "为移动 mac_addresses |%s| 加入列表"
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr "无法不丢失数据地降级"
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr "外键约束无法添加"
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr "priority列没有加入到 networks 表中"
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr "progress列没有加入到实例表中"
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr "无法把 flavorid 转化为整数：%s。设置 flavorid 成类似整数的字符串来降级。"
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr "progress 列没有加入到 compute_nodes 表中"
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr "dns_domains 表没有删除"
+
 #~ msgid "Sending notification on %s..."
 #~ msgstr "正在 %s 上发送通知"
 
@@ -7707,9 +7843,6 @@ msgstr ""
 #~ msgid "Must implement host selection mechanism"
 #~ msgstr "必须实现主机选择机制"
 
-#~ msgid "Maximum number of hosts selected (%d)"
-#~ msgstr "所选择主机的最大数目(%d)"
-
 #~ msgid "Selected excessive host %(host)s"
 #~ msgstr "选择超过了主机 %(host)s"
 
@@ -7815,6 +7948,9 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr "测试：卷获取：id=%(volume_id)s"
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr "试图不过滤没有过滤的实例 %s"
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr "任务 [%(name)s] %(task)s 状态：成功 %(result)s"
 
@@ -7860,6 +7996,12 @@ msgstr ""
 #~ msgid "ISO: Found sr possibly containing the ISO image"
 #~ msgstr "ISO：找到可能包含该ISO镜像的存储库"
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr "(VM_UTILS) xenserver 虚拟机状态 -> |%s|"
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr "(VM_UTILS) xenapi power_state -> |%s|"
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr "正在为VDI%s创建VBD "
 
@@ -7992,6 +8134,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr "获取QoS信息失败"
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr "无法为卷 %s 确定项目，无法导出"
+
 #~ msgid "drive_name not defined"
 #~ msgstr "没有定义drive_name"
 
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index f4ba25bf0..8f75310b6 100644
--- a/nova/locale/zh_TW/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_TW/LC_MESSAGES/nova.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  nova\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-04-22 23:01+0000\n"
+"POT-Creation-Date: 2012-05-13 23:02+0000\n"
 "PO-Revision-Date: 2012-03-07 02:00+0000\n"
 "Last-Translator: Charles Hsu <charles0126+openstack@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
@@ -66,11 +66,11 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:55
+#: nova/exception.py:56
 msgid "Unexpected error while running command."
 msgstr "非預期的執行錯誤"
 
-#: nova/exception.py:58
+#: nova/exception.py:59
 #, python-format
 msgid ""
 "%(description)s\n"
@@ -85,257 +85,262 @@ msgstr ""
 "標準輸出: %(stdout)r\n"
 "標準錯誤輸出: %(stderr)r"
 
-#: nova/exception.py:93
+#: nova/exception.py:72
 msgid "DB exception wrapped."
 msgstr ""
 
-#: nova/exception.py:154
+#: nova/exception.py:131
 msgid "An unknown exception occurred."
 msgstr "發生一個未知例外"
 
-#: nova/exception.py:172
+#: nova/exception.py:149
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:182
+#: nova/exception.py:159
+msgid "Unknown"
+msgstr ""
+
+#: nova/exception.py:179
 msgid "Failed to decrypt text"
 msgstr "內文解碼失敗"
 
-#: nova/exception.py:186
+#: nova/exception.py:183
 msgid "Failed to paginate through images from image service"
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:187
 msgid "Virtual Interface creation failed"
 msgstr "建立虛擬介面失敗"
 
-#: nova/exception.py:194
+#: nova/exception.py:191
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "連續嘗試 5 次建立唯一網路位置(MAC)的虛擬介面失敗"
 
-#: nova/exception.py:199
+#: nova/exception.py:196
 msgid "Connection to glance failed"
 msgstr "連接到glance失敗"
 
-#: nova/exception.py:203
+#: nova/exception.py:200
 msgid "Connection to melange failed"
 msgstr ""
 
-#: nova/exception.py:207
+#: nova/exception.py:204
 msgid "Not authorized."
 msgstr "未被授權"
 
-#: nova/exception.py:212
+#: nova/exception.py:209
 msgid "User does not have admin privileges"
 msgstr "使用者並沒有管理者權力"
 
-#: nova/exception.py:216
+#: nova/exception.py:213
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:217
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:224
+#: nova/exception.py:221
 msgid "Unacceptable parameters."
 msgstr "不可接受的參數值"
 
-#: nova/exception.py:229
+#: nova/exception.py:226
 msgid "Invalid snapshot"
 msgstr "無效的快照(snapshot)"
 
-#: nova/exception.py:233
+#: nova/exception.py:230
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:237 nova/api/openstack/compute/contrib/keypairs.py:113
+#: nova/exception.py:234 nova/api/openstack/compute/contrib/keypairs.py:119
 msgid "Keypair data is invalid"
 msgstr "無效的Keypair"
 
-#: nova/exception.py:241
+#: nova/exception.py:238
 msgid "Failed to load data into json format"
 msgstr ""
 
-#: nova/exception.py:245
+#: nova/exception.py:242
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:249
+#: nova/exception.py:246
 #, python-format
 msgid "Invalid signature %(signature)s for user %(user)s."
 msgstr ""
 
-#: nova/exception.py:253
+#: nova/exception.py:250
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:257
+#: nova/exception.py:254
 #, python-format
 msgid "Invalid instance type %(instance_type)s."
 msgstr ""
 
-#: nova/exception.py:261
+#: nova/exception.py:258
 msgid "Invalid volume type"
 msgstr ""
 
-#: nova/exception.py:265
+#: nova/exception.py:262
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:269
+#: nova/exception.py:266 nova/api/openstack/compute/servers.py:1100
+#: nova/api/openstack/compute/contrib/admin_actions.py:238
+msgid "Invalid metadata"
+msgstr ""
+
+#: nova/exception.py:270
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:273
+#: nova/exception.py:274
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:277
+#: nova/exception.py:278
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:281
+#: nova/exception.py:282
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:285
+#: nova/exception.py:286
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: nova/exception.py:289
+#: nova/exception.py:290
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:296
+#: nova/exception.py:297
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:300
+#: nova/exception.py:301
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:305
+#: nova/exception.py:306
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:309
+#: nova/exception.py:310
 #, 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:314
+#: nova/exception.py:315
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:318
+#: nova/exception.py:319
 #, python-format
 msgid "Instance %(instance_id)s is not suspended."
 msgstr ""
 
-#: nova/exception.py:322
+#: nova/exception.py:323
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:326
+#: nova/exception.py:327
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:330
+#: nova/exception.py:331
 msgid "Failed to resume server"
 msgstr ""
 
-#: nova/exception.py:334
+#: nova/exception.py:335
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:338
+#: nova/exception.py:339
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:342
+#: nova/exception.py:343
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:346
-msgid "Volume service is unavailable at this time."
-msgstr ""
-
-#: nova/exception.py:350
+#: nova/exception.py:347
 msgid "Compute service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:354
+#: nova/exception.py:351
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:356
 msgid "Destination compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:360
 msgid "Original compute host is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:364
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:368
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:373
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:381
+#: nova/exception.py:378
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:382
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:389
+#: nova/exception.py:386
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:393
+#: nova/exception.py:390
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:397
+#: nova/exception.py:394
 #, 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:403
+#: nova/exception.py:400
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -343,745 +348,782 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:410
+#: nova/exception.py:407
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:414
+#: nova/exception.py:411
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:418
+#: nova/exception.py:415
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:422
+#: nova/exception.py:419
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:426
+#: nova/exception.py:423
+msgid "Expected a uuid but received %(uuid)."
+msgstr ""
+
+#: nova/exception.py:427
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:431
+#: nova/exception.py:432
 #, python-format
 msgid "Required flag %(flag)s not set."
 msgstr ""
 
-#: nova/exception.py:435
+#: nova/exception.py:436
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:439
+#: nova/exception.py:440
 #, python-format
 msgid "Unable to locate account %(account_name)s on Solidfire device"
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:445
 #, python-format
 msgid "Volume not found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:449
 #, python-format
 msgid "Volume %(volume_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:454
 msgid "Zero volume types found."
 msgstr ""
 
-#: nova/exception.py:457
+#: nova/exception.py:458
 #, python-format
 msgid "Volume type %(volume_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:461
+#: nova/exception.py:462
 #, python-format
 msgid "Volume type with name %(volume_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:467
 #, python-format
 msgid ""
 "Volume Type %(volume_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:471
+#: nova/exception.py:472
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:475
+#: nova/exception.py:476
 #, python-format
 msgid "deleting volume %(volume_name)s that has snapshot"
 msgstr ""
 
-#: nova/exception.py:479
+#: nova/exception.py:480
 #, python-format
 msgid "deleting snapshot %(snapshot_name)s that has dependent volumes"
 msgstr ""
 
-#: nova/exception.py:484
+#: nova/exception.py:485
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:488
+#: nova/exception.py:489
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:492
+#: nova/exception.py:493
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:496
+#: nova/exception.py:497
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:500
+#: nova/exception.py:501
 msgid ""
 "Some images have been stored via hrefs. This version of the api does not "
 "support displaying image hrefs."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:506
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:510
 #, python-format
 msgid "Kernel not found for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:514
 #, python-format
 msgid "User %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:518
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:522
 #, python-format
 msgid "User %(user_id)s is not a member of project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:526
 #, python-format
 msgid "Role %(role_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:530
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:534
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:538
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:542
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:546
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:549
+#: nova/exception.py:550
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:553
+#: nova/exception.py:554
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:557
+#: nova/exception.py:558
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:561
+#: nova/exception.py:562
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:565
+#: nova/exception.py:566
 #, 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:570
+#: nova/exception.py:571
 #, python-format
 msgid "Host is not set to the network (%(network_id)s)."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:575
 #, python-format
 msgid "Network %(network)s has active ports, cannot delete."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:579
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:582
+#: nova/exception.py:583
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:586
+#: nova/exception.py:587
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:590
+#: nova/exception.py:591
 #, python-format
 msgid "Instance %(instance_id)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:594
+#: nova/exception.py:595
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:599
+#: nova/exception.py:600
 #, python-format
 msgid "Instance %(instance_id)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:603
+#: nova/exception.py:604
 #, python-format
 msgid "Host %(host)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:607
+#: nova/exception.py:608
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:612
+#: nova/exception.py:613
 #, python-format
 msgid "Fixed IP address %(address)s is already in use."
 msgstr ""
 
-#: nova/exception.py:616
+#: nova/exception.py:617
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:620
+#: nova/exception.py:621
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:624
+#: nova/exception.py:625
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:628
+#: nova/exception.py:629
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:632
+#: nova/exception.py:633
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:636
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:640
+#: nova/exception.py:641
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:644
+#: nova/exception.py:645
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:649
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:652
+#: nova/exception.py:653
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:656
+#: nova/exception.py:657
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:660
+#: nova/exception.py:661
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:664
+#: nova/exception.py:665
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:668
+#: nova/exception.py:669
 #, python-format
 msgid "Certificate %(certificate_id)s not found."
 msgstr ""
 
-#: nova/exception.py:672
+#: nova/exception.py:673
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:676
+#: nova/exception.py:677
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:680
+#: nova/exception.py:681
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:684
+#: nova/exception.py:685
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:688
+#: nova/exception.py:689
 #, python-format
 msgid "Auth token %(token)s could not be found."
 msgstr ""
 
-#: nova/exception.py:692
+#: nova/exception.py:693
 #, python-format
 msgid "Access Key %(access_key)s could not be found."
 msgstr ""
 
-#: nova/exception.py:696
+#: nova/exception.py:697
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:700
+#: nova/exception.py:701
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:704
+#: nova/exception.py:705
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:708
+#: nova/exception.py:709
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:712
+#: nova/exception.py:713
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:717
+#: nova/exception.py:718
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:721
+#: nova/exception.py:722
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:727
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:731
+#: nova/exception.py:732
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:735
+#: nova/exception.py:736
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:740
+#: nova/exception.py:741
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:744
+#: nova/exception.py:745
 #, 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:750
+#: nova/exception.py:751
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:754
+#: nova/exception.py:755
 #, python-format
 msgid "Console for instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:758
+#: nova/exception.py:759
 #, python-format
 msgid ""
 "Console for instance %(instance_id)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:763
+#: nova/exception.py:764
 #, python-format
 msgid "Invalid console type %(console_type)s "
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:768
 msgid "Zero instance types found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:772
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:775
+#: nova/exception.py:776
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:781
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:784
+#: nova/exception.py:785
 #, python-format
 msgid "Cell %(cell_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:788
+#: nova/exception.py:789
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:792
+#: nova/exception.py:793
 #, python-format
 msgid "Scheduler cost function %(cost_fn_str)s could not be found."
 msgstr ""
 
-#: nova/exception.py:797
+#: nova/exception.py:798
 #, python-format
 msgid "Scheduler weight flag not found: %(flag_name)s"
 msgstr ""
 
-#: nova/exception.py:801
+#: nova/exception.py:802
 #, python-format
 msgid "Instance %(instance_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:806
+#: nova/exception.py:807
+#, python-format
+msgid ""
+"Instance %(instance_uuid)s has no system metadata with key "
+"%(metadata_key)s."
+msgstr ""
+
+#: nova/exception.py:812
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:811
+#: nova/exception.py:817
 msgid "LDAP object could not be found"
 msgstr ""
 
-#: nova/exception.py:815
+#: nova/exception.py:821
 #, python-format
 msgid "LDAP user %(user_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:819
+#: nova/exception.py:825
 #, python-format
 msgid "LDAP group %(group_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:823
+#: nova/exception.py:829
 #, python-format
 msgid "LDAP user %(user_id)s is not a member of group %(group_id)s."
 msgstr ""
 
-#: nova/exception.py:827
+#: nova/exception.py:833
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:831
+#: nova/exception.py:837
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:835
+#: nova/exception.py:841
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:840
+#: nova/exception.py:846
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:844
+#: nova/exception.py:850
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:848
+#: nova/exception.py:854
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:852
+#: nova/exception.py:858
 #, python-format
 msgid "Unable to use global role %(role_id)s"
 msgstr ""
 
-#: nova/exception.py:856
+#: nova/exception.py:862
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:860
+#: nova/exception.py:866
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:869
+#: nova/exception.py:875
 #, python-format
 msgid "Key pair %(key_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:873
+#: nova/exception.py:879
 #, python-format
 msgid "User %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:877
+#: nova/exception.py:883
 #, python-format
 msgid "LDAP user %(user)s already exists."
 msgstr ""
 
-#: nova/exception.py:881
+#: nova/exception.py:887
 #, python-format
 msgid "LDAP group %(group)s already exists."
 msgstr ""
 
-#: nova/exception.py:885
+#: nova/exception.py:891
 #, python-format
 msgid "User %(uid)s is already a member of the group %(group_dn)s"
 msgstr ""
 
-#: nova/exception.py:890
+#: nova/exception.py:896
 #, python-format
 msgid "Project %(project)s already exists."
 msgstr ""
 
-#: nova/exception.py:894
+#: nova/exception.py:900
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:898
+#: nova/exception.py:904
 #, python-format
 msgid "Instance Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:902
+#: nova/exception.py:908
 #, python-format
 msgid "Volume Type %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:906
+#: nova/exception.py:912
 #, python-format
 msgid "%(path)s is on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:910
+#: nova/exception.py:916
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:914
+#: nova/exception.py:920
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:918
+#: nova/exception.py:924
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:922
+#: nova/exception.py:928
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:926
+#: nova/exception.py:932
 msgid "When resizing, instances must change size!"
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:936
 msgid "Image is larger than instance type allows"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:940
 msgid "1 or more Zones could not complete the request"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:944
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:948
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:952
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:950
+#: nova/exception.py:956
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:954
+#: nova/exception.py:960
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:958
+#: nova/exception.py:964
 #, python-format
 msgid "Host %(host)s is not up or doesn't exist."
 msgstr ""
 
-#: nova/exception.py:962
+#: nova/exception.py:968
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:966
+#: nova/exception.py:972
+#, python-format
+msgid "Quota exceeded: already used %(used)d of %(allowed)d instances"
+msgstr ""
+
+#: nova/exception.py:977
+msgid "Maximum volume size exceeded"
+msgstr ""
+
+#: nova/exception.py:981
+#, python-format
+msgid "Maximum number of metadata items exceeds %(allowed)d"
+msgstr ""
+
+#: nova/exception.py:985
+msgid "Personality file limit exceeded"
+msgstr ""
+
+#: nova/exception.py:989
+msgid "Personality file path too long"
+msgstr ""
+
+#: nova/exception.py:993
+msgid "Personality file content too long"
+msgstr ""
+
+#: nova/exception.py:997
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:971
+#: nova/exception.py:1002
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:975
+#: nova/exception.py:1006
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:979
+#: nova/exception.py:1010
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:983
+#: nova/exception.py:1014
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:1019
 #, python-format
 msgid "Host %(host)s already member of another aggregate."
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:1023
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:996
+#: nova/exception.py:1027
 #, python-format
 msgid "Detected more than one volume with name %(vol_name)s"
 msgstr ""
 
-#: nova/exception.py:1000
+#: nova/exception.py:1031
 #, python-format
 msgid "Cannot create volume_type with name %(name)s and specs %(extra_specs)s"
 msgstr ""
 
-#: nova/exception.py:1005
+#: nova/exception.py:1036
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1009
+#: nova/exception.py:1040
 msgid "Bad response from SolidFire API"
 msgstr ""
 
-#: nova/exception.py:1013
+#: nova/exception.py:1044
 #, python-format
 msgid "Error in SolidFire API response: status=%(status)s"
 msgstr ""
 
-#: nova/exception.py:1017
+#: nova/exception.py:1048
 #, python-format
 msgid "Error in SolidFire API response: data=%(data)s"
 msgstr ""
 
-#: nova/exception.py:1021
+#: nova/exception.py:1052
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1025
+#: nova/exception.py:1056
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1029
+#: nova/exception.py:1060
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1033
+#: nova/exception.py:1064
 #, python-format
 msgid "Could not fetch image %(image)s"
 msgstr ""
 
-#: nova/log.py:328
+#: nova/log.py:331
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
@@ -1105,364 +1147,365 @@ msgstr ""
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/policy.py:30
+#: nova/policy.py:32
 msgid "JSON file representing policy"
 msgstr ""
 
-#: nova/policy.py:33
+#: nova/policy.py:35
 msgid "Rule checked when requested rule is not found"
 msgstr ""
 
-#: nova/service.py:137
+#: nova/service.py:138
 msgid "SIGTERM received"
 msgstr ""
 
-#: nova/service.py:177
+#: nova/service.py:178
 #, python-format
 msgid "Starting %(topic)s node (version %(vcs_string)s)"
 msgstr ""
 
-#: nova/service.py:195
+#: nova/service.py:197
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: nova/service.py:282
+#: nova/service.py:284
 msgid "Service killed that has no database entry"
 msgstr ""
 
-#: nova/service.py:319
+#: nova/service.py:321
 msgid "The service database object disappeared, Recreating it."
 msgstr ""
 
-#: nova/service.py:334
+#: nova/service.py:336
 msgid "Recovered model server connection!"
 msgstr ""
 
-#: nova/service.py:340
+#: nova/service.py:342
 msgid "model server went away"
 msgstr ""
 
-#: nova/service.py:433
+#: nova/service.py:436
 msgid "Full set of FLAGS:"
 msgstr ""
 
-#: nova/service.py:440
+#: nova/service.py:444
 #, python-format
 msgid "%(flag)s : FLAG SET "
 msgstr ""
 
-#: nova/utils.py:79
-#, python-format
-msgid "Inner Exception: %s"
-msgstr ""
-
-#: nova/utils.py:165
+#: nova/utils.py:123
 #, python-format
 msgid "Fetching %s"
 msgstr ""
 
-#: nova/utils.py:210
+#: nova/utils.py:168
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: nova/utils.py:220
+#: nova/utils.py:178
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: nova/utils.py:236 nova/utils.py:315
+#: nova/utils.py:194 nova/utils.py:274
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: nova/utils.py:249
+#: nova/utils.py:207
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: nova/utils.py:291
+#: nova/utils.py:249
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: nova/utils.py:293
+#: nova/utils.py:251
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:297
+#: nova/utils.py:255
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: nova/utils.py:352
+#: nova/utils.py:311
 #, python-format
 msgid "debug in callback: %s"
 msgstr ""
 
-#: nova/utils.py:506
+#: nova/utils.py:465
 #, python-format
 msgid "Link Local address is not found.:%s"
 msgstr ""
 
-#: nova/utils.py:509
+#: nova/utils.py:468
 #, python-format
 msgid "Couldn't get Link Local IP of %(interface)s :%(ex)s"
 msgstr ""
 
-#: nova/utils.py:620
+#: nova/utils.py:580
 #, python-format
 msgid "Invalid backend: %s"
 msgstr ""
 
-#: nova/utils.py:631
+#: nova/utils.py:592
 #, python-format
 msgid "backend %s"
 msgstr ""
 
-#: nova/utils.py:681
+#: nova/utils.py:642
 msgid "in looping call"
 msgstr ""
 
-#: nova/utils.py:899
+#: nova/utils.py:860
 #, python-format
 msgid "Attempting to grab semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:903
+#: nova/utils.py:864
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:907
+#: nova/utils.py:868
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:914
+#: nova/utils.py:875
 #, python-format
 msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: nova/utils.py:973
+#: nova/utils.py:934
 #, python-format
 msgid "Found sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:980
+#: nova/utils.py:941
 #, python-format
 msgid "Cleaned sentinel %(filename)s for pid %(pid)s"
 msgstr ""
 
-#: nova/utils.py:995
+#: nova/utils.py:956
 #, python-format
 msgid "Found lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:999
+#: nova/utils.py:960
 #, python-format
 msgid "Cleaned lockfile %(file)s with link count %(count)d"
 msgstr ""
 
-#: nova/utils.py:1108
+#: nova/utils.py:1069
 #, python-format
 msgid "Expected object of type: %s"
 msgstr ""
 
-#: nova/utils.py:1139
+#: nova/utils.py:1098
 #, python-format
 msgid "Invalid server_string: %s"
 msgstr ""
 
-#: nova/utils.py:1268
+#: nova/utils.py:1227
 #, python-format
 msgid "timefunc: '%(name)s' took %(total_time).2f secs"
 msgstr ""
 
-#: nova/utils.py:1300
-msgid "Original exception being dropped"
+#: nova/utils.py:1318
+#, python-format
+msgid "Reloading cached file %s"
 msgstr ""
 
-#: nova/utils.py:1431
+#: nova/utils.py:1370
 #, python-format
 msgid "Class %(fullname)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1433
+#: nova/utils.py:1372
 #, python-format
 msgid "Class %(fullname)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1465
+#: nova/utils.py:1404
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated: %(msg)s"
 msgstr ""
 
-#: nova/utils.py:1467
+#: nova/utils.py:1406
 #, python-format
 msgid "Function %(name)s in %(location)s is deprecated"
 msgstr ""
 
-#: nova/utils.py:1651
+#: nova/utils.py:1590
 #, python-format
 msgid "Could not remove tmpdir: %s"
 msgstr ""
 
-#: nova/wsgi.py:96
+#: nova/wsgi.py:97
 #, python-format
 msgid "Started %(name)s on %(host)s:%(port)s"
 msgstr ""
 
-#: nova/wsgi.py:107
+#: nova/wsgi.py:108
 msgid "Stopping WSGI server."
 msgstr ""
 
-#: nova/wsgi.py:121
+#: nova/wsgi.py:122
 msgid "WSGI server has stopped."
 msgstr ""
 
-#: nova/wsgi.py:190
+#: nova/wsgi.py:191
 msgid "You must implement __call__"
 msgstr ""
 
+#: nova/wsgi.py:377
+#, python-format
+msgid "Loading app %(name)s from %(path)s"
+msgstr ""
+
 #: nova/api/sizelimit.py:51
 msgid "Request is too large."
 msgstr ""
 
-#: nova/api/validator.py:140
+#: nova/api/validator.py:138
 #, python-format
 msgid "%(key)s with value %(value)s failed validator %(name)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:73
+#: nova/api/ec2/__init__.py:74
 #, python-format
 msgid "%(code)s: %(message)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:95
+#: nova/api/ec2/__init__.py:96
 #, python-format
 msgid "FaultWrapper: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:170
+#: nova/api/ec2/__init__.py:171
 msgid "Too many failed authentications."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:180
+#: nova/api/ec2/__init__.py:181
 #, python-format
 msgid ""
 "Access key %(access_key)s has had %(failures)d failed authentications and"
 " will be locked out for %(lock_mins)d minutes."
 msgstr ""
 
-#: nova/api/ec2/__init__.py:267
+#: nova/api/ec2/__init__.py:268
 msgid "Signature not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:271
+#: nova/api/ec2/__init__.py:272
 msgid "Access key not provided"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:306 nova/api/ec2/__init__.py:319
+#: nova/api/ec2/__init__.py:307 nova/api/ec2/__init__.py:320
 msgid "Failure communicating with keystone"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:388
+#: nova/api/ec2/__init__.py:389
 #, python-format
 msgid "Authentication Failure: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:404
+#: nova/api/ec2/__init__.py:405
 #, python-format
 msgid "Authenticated Request For %(uname)s:%(pname)s)"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:435
+#: nova/api/ec2/__init__.py:436
 #, python-format
 msgid "action: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:437
+#: nova/api/ec2/__init__.py:438
 #, python-format
 msgid "arg: %(key)s\t\tval: %(value)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:512
+#: nova/api/ec2/__init__.py:513
 #, python-format
 msgid "Unauthorized request for controller=%(controller)s and action=%(action)s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:584
+#: nova/api/ec2/__init__.py:585
 #, python-format
 msgid "InstanceNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:590
+#: nova/api/ec2/__init__.py:591
 #, python-format
 msgid "VolumeNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:596
+#: nova/api/ec2/__init__.py:597
 #, python-format
 msgid "SnapshotNotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:602
+#: nova/api/ec2/__init__.py:603
 #, python-format
 msgid "NotFound raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:605
+#: nova/api/ec2/__init__.py:606
 #, python-format
 msgid "EC2APIError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:613
+#: nova/api/ec2/__init__.py:614
 #, python-format
 msgid "KeyPairExists raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:617
+#: nova/api/ec2/__init__.py:618
 #, python-format
 msgid "InvalidParameterValue raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:621
+#: nova/api/ec2/__init__.py:622
 #, python-format
 msgid "InvalidPortRange raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:625
+#: nova/api/ec2/__init__.py:626
 #, python-format
 msgid "NotAuthorized raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:629
+#: nova/api/ec2/__init__.py:630
 #, python-format
 msgid "InvalidRequest raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:633
+#: nova/api/ec2/__init__.py:634
 #, python-format
 msgid "QuotaError raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:637
+#: nova/api/ec2/__init__.py:638
 #, python-format
 msgid "Invalid id: bogus (expecting \"i-...\"): %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:646
+#: nova/api/ec2/__init__.py:647
 #, python-format
 msgid "Unexpected error raised: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:647
+#: nova/api/ec2/__init__.py:648
 #, python-format
 msgid "Environment: %s"
 msgstr ""
 
-#: nova/api/ec2/__init__.py:649 nova/api/metadata/handler.py:248
+#: nova/api/ec2/__init__.py:650 nova/api/metadata/handler.py:248
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
@@ -1471,240 +1514,245 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:336
+#: nova/api/ec2/cloud.py:78 nova/api/ec2/cloud.py:405
+#: nova/api/openstack/compute/contrib/keypairs.py:110
+msgid "Quota exceeded, too many key pairs."
+msgstr ""
+
+#: nova/api/ec2/cloud.py:342
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:372
+#: nova/api/ec2/cloud.py:378
 #, python-format
 msgid ""
 "Value (%s) for KeyName is invalid. Content limited to Alphanumeric "
 "character, spaces, dashes, and underscore."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:378
+#: nova/api/ec2/cloud.py:384
 #, python-format
 msgid "Value (%s) for Keyname is invalid. Length exceeds maximum of 255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:382
+#: nova/api/ec2/cloud.py:388
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:391
+#: nova/api/ec2/cloud.py:397
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:409
+#: nova/api/ec2/cloud.py:420
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:551
+#: nova/api/ec2/cloud.py:562
 msgid "Invalid CIDR"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:639 nova/api/ec2/cloud.py:693
-#: nova/api/ec2/cloud.py:811
+#: nova/api/ec2/cloud.py:650 nova/api/ec2/cloud.py:704
+#: nova/api/ec2/cloud.py:822
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:654
-#: nova/api/openstack/compute/contrib/security_groups.py:529
+#: nova/api/ec2/cloud.py:665
+#: nova/api/openstack/compute/contrib/security_groups.py:530
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:666 nova/api/ec2/cloud.py:719
+#: nova/api/ec2/cloud.py:677 nova/api/ec2/cloud.py:730
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:684 nova/api/ec2/cloud.py:751
+#: nova/api/ec2/cloud.py:695 nova/api/ec2/cloud.py:762
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:708
-#: nova/api/openstack/compute/contrib/security_groups.py:359
+#: nova/api/ec2/cloud.py:719
+#: nova/api/openstack/compute/contrib/security_groups.py:360
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:725
+#: nova/api/ec2/cloud.py:736
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:733
-#: nova/api/openstack/compute/contrib/security_groups.py:388
+#: nova/api/ec2/cloud.py:744
+#: nova/api/openstack/compute/contrib/security_groups.py:389
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:776
+#: nova/api/ec2/cloud.py:787
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Content limited to "
 "Alphanumeric characters, spaces, dashes, and underscores."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:783
+#: nova/api/ec2/cloud.py:794
 #, python-format
 msgid ""
 "Value (%s) for parameter GroupName is invalid. Length exceeds maximum of "
 "255."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:787
-#: nova/api/openstack/compute/contrib/security_groups.py:297
+#: nova/api/ec2/cloud.py:798
+#: nova/api/openstack/compute/contrib/security_groups.py:298
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:790
+#: nova/api/ec2/cloud.py:801
 #, python-format
 msgid "group %s already exists"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:794
-#: nova/api/openstack/compute/contrib/security_groups.py:294
+#: nova/api/ec2/cloud.py:805
+#: nova/api/openstack/compute/contrib/security_groups.py:295
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:826
-#: nova/api/openstack/compute/contrib/security_groups.py:246
+#: nova/api/ec2/cloud.py:837
+#: nova/api/openstack/compute/contrib/security_groups.py:247
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:834 nova/compute/manager.py:1638
+#: nova/api/ec2/cloud.py:845
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:905
+#: nova/api/ec2/cloud.py:916
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:909 nova/api/openstack/compute/contrib/volumes.py:186
-#: nova/api/openstack/volume/volumes.py:222
+#: nova/api/ec2/cloud.py:920 nova/api/openstack/compute/contrib/volumes.py:186
+#: nova/api/openstack/volume/volumes.py:216
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:932
+#: nova/api/ec2/cloud.py:943
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:942
+#: nova/api/ec2/cloud.py:953
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:950
+#: nova/api/ec2/cloud.py:961
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:963 nova/api/openstack/compute/contrib/volumes.py:366
+#: nova/api/ec2/cloud.py:974 nova/api/openstack/compute/contrib/volumes.py:367
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:970
+#: nova/api/ec2/cloud.py:981
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:995 nova/api/ec2/cloud.py:1052
-#: nova/api/ec2/cloud.py:1522 nova/api/ec2/cloud.py:1537
+#: nova/api/ec2/cloud.py:1006 nova/api/ec2/cloud.py:1063
+#: nova/api/ec2/cloud.py:1535 nova/api/ec2/cloud.py:1550
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1118
+#: nova/api/ec2/cloud.py:1129
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1266
+#: nova/api/ec2/cloud.py:1279
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1271
+#: nova/api/ec2/cloud.py:1284
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1276
+#: nova/api/ec2/cloud.py:1289
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1312
+#: nova/api/ec2/cloud.py:1325
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1333
+#: nova/api/ec2/cloud.py:1346
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1347
+#: nova/api/ec2/cloud.py:1360
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1358
+#: nova/api/ec2/cloud.py:1371
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1369
+#: nova/api/ec2/cloud.py:1382
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1459
+#: nova/api/ec2/cloud.py:1472
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1475
+#: nova/api/ec2/cloud.py:1488
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1507
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1540
+#: nova/api/ec2/cloud.py:1553
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1542
+#: nova/api/ec2/cloud.py:1555
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1544
+#: nova/api/ec2/cloud.py:1557
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1546
+#: nova/api/ec2/cloud.py:1559
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1559
+#: nova/api/ec2/cloud.py:1572
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1607
+#: nova/api/ec2/cloud.py:1620
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
@@ -1745,39 +1793,6 @@ msgstr ""
 msgid "Extension %(ext_name)s extending resource: %(collection)s"
 msgstr ""
 
-#: nova/api/openstack/auth.py:90
-#, python-format
-msgid "%(user_id)s could not be found with token '%(token)s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:134
-#, python-format
-msgid "%(user_id)s must be an admin or a member of %(project_id)s"
-msgstr ""
-
-#: nova/api/openstack/auth.py:152
-msgid "Authentication requests must be made against a version root (e.g. /v2)."
-msgstr ""
-
-#: nova/api/openstack/auth.py:167
-#, python-format
-msgid "Could not find %s in request."
-msgstr ""
-
-#: nova/api/openstack/auth.py:191
-#, python-format
-msgid "Successfully authenticated '%s'"
-msgstr ""
-
-#: nova/api/openstack/auth.py:241
-msgid "User not found with provided API key."
-msgstr ""
-
-#: nova/api/openstack/auth.py:258
-#, python-format
-msgid "Provided API key is valid, but not for user '%(username)s'"
-msgstr ""
-
 #: nova/api/openstack/common.py:133 nova/api/openstack/common.py:167
 msgid "limit param must be an integer"
 msgstr ""
@@ -1808,31 +1823,43 @@ msgstr ""
 msgid "Image metadata limit exceeded"
 msgstr ""
 
-#: nova/api/openstack/common.py:295
+#: nova/api/openstack/common.py:286
+msgid "Image metadata key cannot be blank"
+msgstr ""
+
+#: nova/api/openstack/common.py:289
+msgid "Image metadata key too long"
+msgstr ""
+
+#: nova/api/openstack/common.py:292
+msgid "Invalid image metadata"
+msgstr ""
+
+#: nova/api/openstack/common.py:308
 #, python-format
 msgid "Converting nw_info: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:305
+#: nova/api/openstack/common.py:318
 #, python-format
 msgid "Converted networks: %s"
 msgstr ""
 
-#: nova/api/openstack/common.py:338
+#: nova/api/openstack/common.py:351
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
-#: nova/api/openstack/common.py:341
+#: nova/api/openstack/common.py:354
 #, python-format
 msgid "Instance is in an invalid state for '%(action)s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:421
+#: nova/api/openstack/common.py:434
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:423
+#: nova/api/openstack/common.py:436
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
@@ -1841,57 +1868,57 @@ msgstr ""
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:225
+#: nova/api/openstack/extensions.py:226
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:226
+#: nova/api/openstack/extensions.py:227
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:227
+#: nova/api/openstack/extensions.py:228
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:229
+#: nova/api/openstack/extensions.py:230
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:230
+#: nova/api/openstack/extensions.py:231
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:232
+#: nova/api/openstack/extensions.py:233
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:246
+#: nova/api/openstack/extensions.py:247
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:252
+#: nova/api/openstack/extensions.py:253
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:264
+#: nova/api/openstack/extensions.py:265
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:344
+#: nova/api/openstack/extensions.py:345
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:368
+#: nova/api/openstack/extensions.py:369
 #, python-format
 msgid "Failed to load extension %(ext_name)s: %(exc)s"
 msgstr ""
@@ -1986,31 +2013,43 @@ msgstr ""
 msgid "Initializing extension manager."
 msgstr ""
 
+#: nova/api/openstack/compute/flavors.py:101
+#, python-format
+msgid "Invalid minRam filter [%s]"
+msgstr ""
+
+#: nova/api/openstack/compute/flavors.py:108
+#, python-format
+msgid "Invalid minDisk filter [%s]"
+msgstr ""
+
 #: nova/api/openstack/compute/image_metadata.py:40
 #: nova/api/openstack/compute/images.py:146
 #: nova/api/openstack/compute/images.py:161
 msgid "Image not found."
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:79
+#: nova/api/openstack/compute/image_metadata.py:80
 msgid "Incorrect request body format"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:83
+#: nova/api/openstack/compute/image_metadata.py:84
 #: nova/api/openstack/compute/server_metadata.py:80
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:79
-#: nova/api/openstack/compute/contrib/volumetypes.py:188
+#: nova/api/openstack/compute/contrib/volumetypes.py:177
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:104
 msgid "Request body and URI mismatch"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:86
+#: nova/api/openstack/compute/image_metadata.py:87
 #: nova/api/openstack/compute/server_metadata.py:84
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:82
-#: nova/api/openstack/compute/contrib/volumetypes.py:191
+#: nova/api/openstack/compute/contrib/volumetypes.py:180
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:107
 msgid "Request body contains too many items"
 msgstr ""
 
-#: nova/api/openstack/compute/image_metadata.py:111
+#: nova/api/openstack/compute/image_metadata.py:113
 msgid "Invalid metadata key"
 msgstr ""
 
@@ -2035,216 +2074,203 @@ msgstr ""
 
 #: nova/api/openstack/compute/server_metadata.py:38
 #: nova/api/openstack/compute/server_metadata.py:122
-#: nova/api/openstack/compute/server_metadata.py:159
+#: nova/api/openstack/compute/server_metadata.py:163
 msgid "Server does not exist"
 msgstr ""
 
-#: nova/api/openstack/compute/server_metadata.py:141
-#: nova/api/openstack/compute/server_metadata.py:152
+#: nova/api/openstack/compute/server_metadata.py:145
+#: nova/api/openstack/compute/server_metadata.py:156
 msgid "Metadata item was not found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:420
+#: nova/api/openstack/compute/servers.py:423
 #, python-format
 msgid "Invalid server status: %(status)s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:428
+#: nova/api/openstack/compute/servers.py:431
 msgid "Invalid changes-since value"
 msgstr ""
 
 #: nova/api/openstack/compute/servers.py:476
-msgid "Personality file limit exceeded"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:478
-msgid "Personality file path too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:480
-msgid "Personality file content too long"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:494
 msgid "Server name is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:498
+#: nova/api/openstack/compute/servers.py:480
 msgid "Server name is an empty string"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:502
+#: nova/api/openstack/compute/servers.py:484
 msgid "Server name must be less than 256 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:519
+#: nova/api/openstack/compute/servers.py:501
 #, python-format
 msgid "Bad personality format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:522
+#: nova/api/openstack/compute/servers.py:504
 msgid "Bad personality format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:527
+#: nova/api/openstack/compute/servers.py:509
 #, python-format
 msgid "Personality content for %s cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:540
+#: nova/api/openstack/compute/servers.py:522
 #, python-format
 msgid "Bad networks format: network uuid is not in proper format (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:549
+#: nova/api/openstack/compute/servers.py:531
 #, python-format
 msgid "Invalid fixed IP address (%s)"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:556
+#: nova/api/openstack/compute/servers.py:538
 #, python-format
 msgid "Duplicate networks (%s) are not allowed"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:562
+#: nova/api/openstack/compute/servers.py:544
 #, python-format
 msgid "Bad network format: missing %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:565
+#: nova/api/openstack/compute/servers.py:547
 msgid "Bad networks format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:577
+#: nova/api/openstack/compute/servers.py:559
 msgid "Userdata content cannot be decoded"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:584
+#: nova/api/openstack/compute/servers.py:566
 msgid "accessIPv4 is not proper IPv4 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:591
+#: nova/api/openstack/compute/servers.py:573
 msgid "accessIPv6 is not proper IPv6 format"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:623
+#: nova/api/openstack/compute/servers.py:605
 msgid "Server name is not defined"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:665
-#: nova/api/openstack/compute/servers.py:730
+#: nova/api/openstack/compute/servers.py:647
+#: nova/api/openstack/compute/servers.py:715
 msgid "Invalid flavorRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:727
+#: nova/api/openstack/compute/servers.py:712
 msgid "Can not find requested image"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:733
+#: nova/api/openstack/compute/servers.py:718
 msgid "Invalid key_name provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:819
-#: nova/api/openstack/compute/servers.py:839
+#: nova/api/openstack/compute/servers.py:784
+msgid "HostId cannot be updated."
+msgstr ""
+
+#: nova/api/openstack/compute/servers.py:808
+#: nova/api/openstack/compute/servers.py:828
 msgid "Instance has not been resized."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:825
+#: nova/api/openstack/compute/servers.py:814
 #, python-format
 msgid "Error in confirm-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:845
+#: nova/api/openstack/compute/servers.py:834
 #, python-format
 msgid "Error in revert-resize %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:858
+#: nova/api/openstack/compute/servers.py:847
 msgid "Argument 'type' for reboot is not HARD or SOFT"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:862
+#: nova/api/openstack/compute/servers.py:851
 msgid "Missing argument 'type' for reboot"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:875
+#: nova/api/openstack/compute/servers.py:864
 #, python-format
 msgid "Error in reboot %s"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:887
+#: nova/api/openstack/compute/servers.py:876
 msgid "Unable to locate requested flavor."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:890
+#: nova/api/openstack/compute/servers.py:879
 msgid "Resize requires a change in size."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:914
+#: nova/api/openstack/compute/servers.py:903
 msgid "Malformed server entity"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:921
+#: nova/api/openstack/compute/servers.py:910
 msgid "Missing imageRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:930
+#: nova/api/openstack/compute/servers.py:919
 msgid "Invalid imageRef provided."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:939
+#: nova/api/openstack/compute/servers.py:928
 msgid "Missing flavorRef attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:952
+#: nova/api/openstack/compute/servers.py:941
 msgid "No adminPass was specified"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:956
-#: nova/api/openstack/compute/servers.py:1134
+#: nova/api/openstack/compute/servers.py:945
+#: nova/api/openstack/compute/servers.py:1133
 msgid "Invalid adminPass"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:970
+#: nova/api/openstack/compute/servers.py:959
 msgid "Unable to parse metadata key/value pairs."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:983
+#: nova/api/openstack/compute/servers.py:972
 msgid "Resize request has invalid 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:986
+#: nova/api/openstack/compute/servers.py:975
 msgid "Resize requests require 'flavorRef' attribute."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1004
+#: nova/api/openstack/compute/servers.py:993
 #: nova/api/openstack/compute/contrib/aggregates.py:142
 #: nova/api/openstack/compute/contrib/networks.py:68
 msgid "Invalid request body"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1009
+#: nova/api/openstack/compute/servers.py:998
 msgid "Could not parse imageRef from request."
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1061
+#: nova/api/openstack/compute/servers.py:1053
 msgid "Instance could not be found"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1064
+#: nova/api/openstack/compute/servers.py:1058
 msgid "Cannot find image for rebuild"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1093
+#: nova/api/openstack/compute/servers.py:1091
 msgid "createImage entity requires name attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/servers.py:1102
-#: nova/api/openstack/compute/contrib/admin_actions.py:238
-msgid "Invalid metadata"
-msgstr ""
-
-#: nova/api/openstack/compute/servers.py:1157
+#: nova/api/openstack/compute/servers.py:1160
 #, python-format
 msgid "Removing options '%(unk_opt_str)s' from query"
 msgstr ""
@@ -2320,7 +2346,6 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/console_output.py:59
 #: nova/api/openstack/compute/contrib/consoles.py:49
 #: nova/api/openstack/compute/contrib/consoles.py:60
-#: nova/api/openstack/compute/contrib/server_action_list.py:49
 #: nova/api/openstack/compute/contrib/server_diagnostics.py:47
 #: nova/api/openstack/compute/contrib/server_start_stop.py:38
 msgid "Instance not found"
@@ -2413,32 +2438,33 @@ msgid "Flavor not found."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/flavorextraspecs.py:49
-#: nova/api/openstack/compute/contrib/volumetypes.py:158
+#: nova/api/openstack/compute/contrib/volumetypes.py:150
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:65
 msgid "No Request Body"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:157
+#: nova/api/openstack/compute/contrib/floating_ips.py:156
 #, python-format
 msgid "No more floating ips in pool %s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:159
+#: nova/api/openstack/compute/contrib/floating_ips.py:158
 msgid "No more floating ips available."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:197
-#: nova/api/openstack/compute/contrib/floating_ips.py:223
-#: nova/api/openstack/compute/contrib/security_groups.py:583
-#: nova/api/openstack/compute/contrib/security_groups.py:616
+#: nova/api/openstack/compute/contrib/floating_ips.py:196
+#: nova/api/openstack/compute/contrib/floating_ips.py:222
+#: nova/api/openstack/compute/contrib/security_groups.py:584
+#: nova/api/openstack/compute/contrib/security_groups.py:617
 msgid "Missing parameter dict"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:200
-#: nova/api/openstack/compute/contrib/floating_ips.py:226
+#: nova/api/openstack/compute/contrib/floating_ips.py:199
+#: nova/api/openstack/compute/contrib/floating_ips.py:225
 msgid "Address not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/floating_ips.py:209
+#: nova/api/openstack/compute/contrib/floating_ips.py:208
 msgid "No fixed ips associated to instance"
 msgstr ""
 
@@ -2467,23 +2493,23 @@ msgstr ""
 msgid "Setting host %(host)s to %(state)s."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:230
+#: nova/api/openstack/compute/contrib/hosts.py:228
 msgid "Describe-resource is admin only functionality"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/hosts.py:238
+#: nova/api/openstack/compute/contrib/hosts.py:236
 msgid "Host not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:70
+#: nova/api/openstack/compute/contrib/keypairs.py:71
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:95
+#: nova/api/openstack/compute/contrib/keypairs.py:96
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/keypairs.py:100
+#: nova/api/openstack/compute/contrib/keypairs.py:101
 #, python-format
 msgid "Key pair '%s' already exists."
 msgstr ""
@@ -2535,114 +2561,121 @@ msgstr ""
 msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:223
+#: nova/api/openstack/compute/contrib/security_groups.py:224
 msgid "Security group id should be integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:244
+#: nova/api/openstack/compute/contrib/security_groups.py:245
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:300
+#: nova/api/openstack/compute/contrib/security_groups.py:301
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:320
+#: nova/api/openstack/compute/contrib/security_groups.py:321
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:323
+#: nova/api/openstack/compute/contrib/security_groups.py:324
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:326
+#: nova/api/openstack/compute/contrib/security_groups.py:327
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:353
+#: nova/api/openstack/compute/contrib/security_groups.py:354
 msgid "Parent group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:356
+#: nova/api/openstack/compute/contrib/security_groups.py:357
 #, python-format
 msgid "Security group (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:374
+#: nova/api/openstack/compute/contrib/security_groups.py:375
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:381
+#: nova/api/openstack/compute/contrib/security_groups.py:382
 #, python-format
 msgid "This rule already exists in group %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:426
+#: nova/api/openstack/compute/contrib/security_groups.py:427
 msgid "Parent or group id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:519
+#: nova/api/openstack/compute/contrib/security_groups.py:520
 msgid "Rule id is not integer"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:522
+#: nova/api/openstack/compute/contrib/security_groups.py:523
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:586
-#: nova/api/openstack/compute/contrib/security_groups.py:619
+#: nova/api/openstack/compute/contrib/security_groups.py:587
+#: nova/api/openstack/compute/contrib/security_groups.py:620
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:590
-#: nova/api/openstack/compute/contrib/security_groups.py:623
+#: nova/api/openstack/compute/contrib/security_groups.py:591
+#: nova/api/openstack/compute/contrib/security_groups.py:624
 msgid "Security group name cannot be empty"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:45
-#, python-format
-msgid "start instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:46
+msgid "start instance"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/server_start_stop.py:54
-#, python-format
-msgid "stop instance %r"
+#: nova/api/openstack/compute/contrib/server_start_stop.py:55
+msgid "stop instance"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:73
-#: nova/api/openstack/volume/volumes.py:106
+#: nova/api/openstack/volume/volumes.py:100
 #, python-format
 msgid "vol=%s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/volumes.py:146
-#: nova/api/openstack/volume/volumes.py:184
+#: nova/api/openstack/volume/volumes.py:178
 #, python-format
 msgid "Delete volume with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:329
+#: nova/api/openstack/compute/contrib/volumes.py:330
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(server_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:481
+#: nova/api/openstack/compute/contrib/volumes.py:376
+#, python-format
+msgid "Instance %s is not attached."
+msgstr ""
+
+#: nova/api/openstack/compute/contrib/volumes.py:482
 #: nova/api/openstack/volume/snapshots.py:110
 #, python-format
 msgid "Delete snapshot with id: %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/volumes.py:524
+#: nova/api/openstack/compute/contrib/volumes.py:525
 #: nova/api/openstack/volume/snapshots.py:150
 #, python-format
 msgid "Create snapshot from volume %s"
 msgstr ""
 
+#: nova/api/openstack/volume/contrib/types_extra_specs.py:90
+msgid "Malformed extra specs"
+msgstr ""
+
 #: nova/auth/fakeldap.py:33
 msgid "Attempted to instantiate singleton"
 msgstr ""
@@ -2654,261 +2687,272 @@ msgid ""
 "instead."
 msgstr ""
 
-#: nova/auth/manager.py:298
+#: nova/auth/manager.py:299
 #, python-format
 msgid "Looking up user: %r"
 msgstr ""
 
-#: nova/auth/manager.py:302
+#: nova/auth/manager.py:303
 #, python-format
 msgid "Failed authorization for access key %s"
 msgstr ""
 
-#: nova/auth/manager.py:308
+#: nova/auth/manager.py:309
 #, python-format
 msgid "Using project name = user name (%s)"
 msgstr ""
 
-#: nova/auth/manager.py:315
+#: nova/auth/manager.py:316
 #, python-format
 msgid "failed authorization: no project named %(pjid)s (user=%(uname)s)"
 msgstr ""
 
-#: nova/auth/manager.py:324
+#: nova/auth/manager.py:325
 #, python-format
 msgid ""
 "Failed authorization: user %(uname)s not admin and not member of project "
 "%(pjname)s"
 msgstr ""
 
-#: nova/auth/manager.py:331 nova/auth/manager.py:343
+#: nova/auth/manager.py:332 nova/auth/manager.py:344
 #, python-format
 msgid "user.secret: %s"
 msgstr ""
 
-#: nova/auth/manager.py:332 nova/auth/manager.py:344
+#: nova/auth/manager.py:333 nova/auth/manager.py:345
 #, python-format
 msgid "expected_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:333 nova/auth/manager.py:345
+#: nova/auth/manager.py:334 nova/auth/manager.py:346
 #, python-format
 msgid "signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:335 nova/auth/manager.py:357
+#: nova/auth/manager.py:336 nova/auth/manager.py:358
 #, python-format
 msgid "Invalid signature for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:353
+#: nova/auth/manager.py:354
 #, python-format
 msgid "host_only_signature: %s"
 msgstr ""
 
-#: nova/auth/manager.py:449
+#: nova/auth/manager.py:450
 msgid "Must specify project"
 msgstr ""
 
-#: nova/auth/manager.py:490
+#: nova/auth/manager.py:491
 #, python-format
 msgid "Adding role %(role)s to user %(uid)s in project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:493
+#: nova/auth/manager.py:494
 #, python-format
 msgid "Adding sitewide role %(role)s to user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:519
+#: nova/auth/manager.py:520
 #, python-format
 msgid "Removing role %(role)s from user %(uid)s on project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:522
+#: nova/auth/manager.py:523
 #, python-format
 msgid "Removing sitewide role %(role)s from user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:595
+#: nova/auth/manager.py:596
 #, python-format
 msgid "Created project %(name)s with manager %(manager_user)s"
 msgstr ""
 
-#: nova/auth/manager.py:613
+#: nova/auth/manager.py:614
 #, python-format
 msgid "modifying project %s"
 msgstr ""
 
-#: nova/auth/manager.py:625
+#: nova/auth/manager.py:626
 #, python-format
 msgid "Adding user %(uid)s to project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:646
+#: nova/auth/manager.py:647
 #, python-format
 msgid "Remove user %(uid)s from project %(pid)s"
 msgstr ""
 
-#: nova/auth/manager.py:676
+#: nova/auth/manager.py:677
 #, python-format
 msgid "Deleting project %s"
 msgstr ""
 
-#: nova/auth/manager.py:734
+#: nova/auth/manager.py:735
 #, python-format
 msgid "Created user %(rvname)s (admin: %(rvadmin)r)"
 msgstr ""
 
-#: nova/auth/manager.py:743
+#: nova/auth/manager.py:744
 #, python-format
 msgid "Deleting user %s"
 msgstr ""
 
-#: nova/auth/manager.py:753
+#: nova/auth/manager.py:754
 #, python-format
 msgid "Access Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:755
+#: nova/auth/manager.py:756
 #, python-format
 msgid "Secret Key change for user %s"
 msgstr ""
 
-#: nova/auth/manager.py:757
+#: nova/auth/manager.py:758
 #, python-format
 msgid "Admin status set to %(admin)r for user %(uid)s"
 msgstr ""
 
-#: nova/auth/manager.py:802
+#: nova/auth/manager.py:803
 #, python-format
 msgid "No vpn data for project %s"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:46
+#: nova/auth/signer.py:147
+msgid "SHA256 not supported on this server"
+msgstr ""
+
+#: nova/cloudpipe/pipelib.py:45
 msgid "Instance type for vpn instances"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:49
+#: nova/cloudpipe/pipelib.py:48
 msgid "Template for cloudpipe instance boot script"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:52
+#: nova/cloudpipe/pipelib.py:51
 msgid "Network to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:55
+#: nova/cloudpipe/pipelib.py:54
 msgid "Netmask to push into openvpn config"
 msgstr ""
 
-#: nova/cloudpipe/pipelib.py:107
+#: nova/cloudpipe/pipelib.py:106
 #, python-format
 msgid "Launching VPN for %s"
 msgstr ""
 
-#: nova/compute/api.py:133
+#: nova/compute/api.py:131
 msgid "No compute host specified"
 msgstr ""
 
-#: nova/compute/api.py:136
+#: nova/compute/api.py:134
 #, python-format
 msgid "Unable to find host for Instance %s"
 msgstr ""
 
-#: nova/compute/api.py:198
+#: nova/compute/api.py:195
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:200
+#: nova/compute/api.py:198
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:202
+#: nova/compute/api.py:201
 #, python-format
 msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:216
+#: nova/compute/api.py:215
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:227
-#, python-format
-msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#: nova/compute/api.py:225
+msgid "Metadata property key blank"
+msgstr ""
+
+#: nova/compute/api.py:229
+msgid "Metadata property key greater than 255 characters"
+msgstr ""
+
+#: nova/compute/api.py:233
+msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:424
+#: nova/compute/api.py:429
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:492
+#: nova/compute/api.py:497
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:519
+#: nova/compute/api.py:524
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:636
+#: nova/compute/api.py:648
 #, python-format
 msgid "Sending create to scheduler for %(pid)s/%(uid)s's"
 msgstr ""
 
-#: nova/compute/api.py:916
+#: nova/compute/api.py:928
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:936
+#: nova/compute/api.py:948
 msgid "No host for instance, deleting immediately"
 msgstr ""
 
-#: nova/compute/api.py:984
+#: nova/compute/api.py:996
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1022
+#: nova/compute/api.py:1034
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1041
+#: nova/compute/api.py:1053
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1045
+#: nova/compute/api.py:1057
 #, python-format
 msgid "Instance %(instance_uuid)s is not stopped. (%(vm_state)s"
 msgstr ""
 
-#: nova/compute/api.py:1116 nova/volume/api.py:173
+#: nova/compute/api.py:1128 nova/volume/api.py:173
 #: nova/volume/volume_types.py:64
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1246
+#: nova/compute/api.py:1258
 #, python-format
 msgid "Image type not recognized %s"
 msgstr ""
 
-#: nova/compute/api.py:1414
+#: nova/compute/api.py:1437
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:1422
+#: nova/compute/api.py:1445
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:1689
+#: nova/compute/api.py:1710
 #, python-format
 msgid "multiple fixedips exist, using the first: %s"
 msgstr ""
@@ -2927,493 +2971,468 @@ msgstr ""
 msgid "Instance type %s not found for deletion"
 msgstr ""
 
-#: nova/compute/manager.py:138
+#: nova/compute/manager.py:153
 #, python-format
 msgid "check_instance_lock: decorating: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:140
+#: nova/compute/manager.py:155
 #, python-format
 msgid "check_instance_lock: arguments: |%(self)s| |%(context)s|"
 msgstr ""
 
-#: nova/compute/manager.py:144
+#: nova/compute/manager.py:159
 #, python-format
 msgid "check_instance_lock: locked: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:146
+#: nova/compute/manager.py:161
 #, python-format
 msgid "check_instance_lock: admin: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:151
+#: nova/compute/manager.py:166
 #, python-format
 msgid "check_instance_lock: executing: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:155
+#: nova/compute/manager.py:170
 #, python-format
 msgid "check_instance_lock: not executing |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:201
+#: nova/compute/manager.py:231
 #, python-format
 msgid "Unable to load the virtualization driver: %s"
 msgstr ""
 
-#: nova/compute/manager.py:223
+#: nova/compute/manager.py:253
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:240
+#: nova/compute/manager.py:269
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:245
+#: nova/compute/manager.py:274
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:255
+#: nova/compute/manager.py:284
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:260
+#: nova/compute/manager.py:289
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:329
+#: nova/compute/manager.py:358
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:400
-msgid "Instance already deleted from database. Attempting forceful vm deletion"
-msgstr ""
-
-#: nova/compute/manager.py:406
-msgid "Exception encountered while terminating the instance"
-msgstr ""
-
-#: nova/compute/manager.py:444
+#: nova/compute/manager.py:445
 msgid "Instance not found."
 msgstr ""
 
-#: nova/compute/manager.py:481
+#: nova/compute/manager.py:477
 msgid "Instance has already been created"
 msgstr ""
 
-#: nova/compute/manager.py:524
+#: nova/compute/manager.py:520
 #, 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:530
+#: nova/compute/manager.py:526
 #, 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:540
+#: nova/compute/manager.py:536
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:550
+#: nova/compute/manager.py:546
 msgid "Skipping network allocation for instance"
 msgstr ""
 
-#: nova/compute/manager.py:563
+#: nova/compute/manager.py:559
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:563
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:580
+#: nova/compute/manager.py:576
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:596
+#: nova/compute/manager.py:592
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:617
+#: nova/compute/manager.py:616
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:674
+#: nova/compute/manager.py:671
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:701
+#: nova/compute/manager.py:698
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:710
+#: nova/compute/manager.py:707
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:744 nova/compute/manager.py:1335
-#: nova/compute/manager.py:1424 nova/compute/manager.py:2509
+#: nova/compute/manager.py:746 nova/compute/manager.py:1363
+#: nova/compute/manager.py:1459 nova/compute/manager.py:2539
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:813
+#: nova/compute/manager.py:819
 msgid "Cannot rebuild instance because the given image does not exist."
 msgstr ""
 
-#: nova/compute/manager.py:818
+#: nova/compute/manager.py:824
 #, python-format
 msgid "Cannot rebuild instance: %(exc)s"
 msgstr ""
 
-#: nova/compute/manager.py:825
+#: nova/compute/manager.py:832
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:879
+#: nova/compute/manager.py:898
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:895
+#: nova/compute/manager.py:914
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:937
+#: nova/compute/manager.py:956
 #, python-format
 msgid "instance %s: snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:943
+#: nova/compute/manager.py:962
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1000
+#: nova/compute/manager.py:1021
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1006
+#: nova/compute/manager.py:1027
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1011
+#: nova/compute/manager.py:1032
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:1042
+#: nova/compute/manager.py:1063
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:1048
+#: nova/compute/manager.py:1069
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:1056
+#: nova/compute/manager.py:1077
 msgid "set_admin_password is not implemented by this driver."
 msgstr ""
 
-#: nova/compute/manager.py:1070
+#: nova/compute/manager.py:1091
 msgid "Error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:1085
+#: nova/compute/manager.py:1106
 #, python-format
 msgid ""
-"trying to inject a file into a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to inject a file into a non-running (state: "
+"%(current_power_state)s expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1110
 #, python-format
-msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+msgid "injecting file to %(path)s"
 msgstr ""
 
-#: nova/compute/manager.py:1104
+#: nova/compute/manager.py:1124
 #, python-format
 msgid ""
-"trying to update agent on a non-running instance: %(instance_uuid)s "
-"(state: %(current_power_state)s expected: %(expected_state)s)"
+"trying to update agent on a non-running (state: %(current_power_state)s "
+"expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1109
+#: nova/compute/manager.py:1128
 #, python-format
-msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+msgid "updating agent to %(url)s"
 msgstr ""
 
-#: nova/compute/manager.py:1122
-#, python-format
-msgid "instance %s: rescuing"
+#: nova/compute/manager.py:1141
+msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1147
-#, python-format
-msgid "instance %s: unrescuing"
+#: nova/compute/manager.py:1166
+msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:1277
+#: nova/compute/manager.py:1302
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:1294
-#, python-format
-msgid "instance %s: migrating"
+#: nova/compute/manager.py:1319
+msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:1479
-#, python-format
-msgid "instance %s: pausing"
+#: nova/compute/manager.py:1518
+msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:1497
-#, python-format
-msgid "instance %s: unpausing"
+#: nova/compute/manager.py:1536
+msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:1533
-#, python-format
-msgid "instance %s: retrieving diagnostics"
+#: nova/compute/manager.py:1569
+msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:1542
-#, python-format
-msgid "instance %s: suspending"
+#: nova/compute/manager.py:1581
+msgid "Suspending"
 msgstr ""
 
-#: nova/compute/manager.py:1564
-#, python-format
-msgid "instance %s: resuming"
+#: nova/compute/manager.py:1601
+msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:1587
-#, python-format
-msgid "instance %s: locking"
+#: nova/compute/manager.py:1619
+msgid "Locking"
 msgstr ""
 
-#: nova/compute/manager.py:1596
-#, python-format
-msgid "instance %s: unlocking"
+#: nova/compute/manager.py:1628
+msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/manager.py:1604
-#, python-format
-msgid "instance %s: getting locked state"
+#: nova/compute/manager.py:1638
+msgid "Getting locked state"
 msgstr ""
 
-#: nova/compute/manager.py:1614
-#, python-format
-msgid "instance %s: reset network"
+#: nova/compute/manager.py:1647
+msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:1622
-#, python-format
-msgid "instance %s: inject network info"
+#: nova/compute/manager.py:1655
+msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:1626
+#: nova/compute/manager.py:1658
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1663
-#, python-format
-msgid "instance %s: getting vnc console"
+#: nova/compute/manager.py:1672
+msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:1693
-#, python-format
-msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
+#: nova/compute/manager.py:1699
+msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:1711
+#: nova/compute/manager.py:1727
 #, python-format
-msgid ""
-"instance %(instance_uuid)s: attaching volume %(volume_id)s to "
-"%(mountpoint)s"
+msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1713
+#: nova/compute/manager.py:1744
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1722
+#: nova/compute/manager.py:1753
 #, python-format
-msgid "instance %(instance_uuid)s: attach failed %(mountpoint)s, removing"
+msgid ""
+"Failed to connect to volume %(volume_id)s while attaching at "
+"%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:1732
-#, python-format
-msgid "Attach failed %(mountpoint)s, removing"
-msgstr ""
+#: nova/compute/manager.py:1764
+#, fuzzy, python-format
+msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
+msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:1760
+#: nova/compute/manager.py:1796
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:1764
-#, python-format
-msgid "Detaching volume from unknown instance %s"
-msgstr ""
+#: nova/compute/manager.py:1800
+#, fuzzy, python-format
+msgid "Detaching volume from unknown instance"
+msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:1830
+#: nova/compute/manager.py:1865
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/compute/manager.py:1892
+#: nova/compute/manager.py:1924
 msgid "Instance has no volume."
 msgstr ""
 
-#: nova/compute/manager.py:1924
+#: nova/compute/manager.py:1956
 #, python-format
 msgid "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:2013
 #, python-format
 msgid "Pre live migration failed at  %(dest)s"
 msgstr ""
 
-#: nova/compute/manager.py:2008
+#: nova/compute/manager.py:2040
 msgid "post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:2038
+#: nova/compute/manager.py:2069
 msgid "No floating_ip found"
 msgstr ""
 
-#: nova/compute/manager.py:2046
+#: nova/compute/manager.py:2077
 msgid "No floating_ip found."
 msgstr ""
 
-#: nova/compute/manager.py:2048
+#: nova/compute/manager.py:2079
 #, python-format
 msgid ""
 "Live migration: Unexpected error: cannot inherit floating ip.\n"
 "%(e)s"
 msgstr ""
 
-#: nova/compute/manager.py:2081
+#: nova/compute/manager.py:2108
 #, python-format
 msgid "Migrating instance to %(dest)s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:2083
+#: nova/compute/manager.py:2110
 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:2098
+#: nova/compute/manager.py:2125
 msgid "Post operation of migraton started"
 msgstr ""
 
-#: nova/compute/manager.py:2234
-#, python-format
-msgid "Updated the info_cache for instance %s"
+#: nova/compute/manager.py:2262
+msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:2263
+#: nova/compute/manager.py:2291
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:2285
+#: nova/compute/manager.py:2315
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:2313
+#: nova/compute/manager.py:2344
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:2339
+#: nova/compute/manager.py:2370
 #, python-format
 msgid ""
-"During the sync_power process the instance %(uuid)s has moved from host "
-"%(src)s to host %(dst)s"
+"During the sync_power process the instance has moved from host %(src)s to"
+" host %(dst)s"
 msgstr ""
 
-#: nova/compute/manager.py:2352
-#, python-format
+#: nova/compute/manager.py:2383
 msgid ""
-"Instance %s is in the process of migrating to this host. Wait next "
+"Instance is in the process of migrating to this host. Wait next "
 "sync_power cycle before setting power state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2358
+#: nova/compute/manager.py:2389
 msgid ""
 "Instance found in database but not known by hypervisor. Setting power "
 "state to NOSTATE"
 msgstr ""
 
-#: nova/compute/manager.py:2388
+#: nova/compute/manager.py:2419
 msgid "FLAGS.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:2400
+#: nova/compute/manager.py:2430
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:2466
+#: nova/compute/manager.py:2496
 #, 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:2473
+#: nova/compute/manager.py:2503
 #, 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:2480
+#: nova/compute/manager.py:2510
 #, python-format
 msgid "Unrecognized value '%(action)s' for FLAGS.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:2550
+#: nova/compute/manager.py:2578
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: unrecoverable state during operation on "
 "%(host)s"
 msgstr ""
 
-#: nova/compute/utils.py:142
+#: nova/compute/utils.py:181
 msgid "v4 subnets are required for legacy nw_info"
 msgstr ""
 
-#: nova/console/manager.py:77 nova/console/vmrc_manager.py:70
+#: nova/console/manager.py:78 nova/console/vmrc_manager.py:70
 msgid "Adding console"
 msgstr ""
 
-#: nova/console/manager.py:97
+#: nova/console/manager.py:98
 #, python-format
 msgid "Tried to remove non-existant console %(console_id)s."
 msgstr ""
@@ -3458,17 +3477,17 @@ msgstr ""
 msgid "xvp not running..."
 msgstr ""
 
-#: nova/consoleauth/manager.py:63
+#: nova/consoleauth/manager.py:61
 #, python-format
 msgid "Deleting Expired Token: (%s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:75
+#: nova/consoleauth/manager.py:73
 #, python-format
 msgid "Received Token: %(token)s, %(token_dict)s)"
 msgstr ""
 
-#: nova/consoleauth/manager.py:79
+#: nova/consoleauth/manager.py:77
 #, python-format
 msgid "Checking Token: %(token)s, %(token_valid)s)"
 msgstr ""
@@ -3477,37 +3496,37 @@ msgstr ""
 msgid "Use of empty request context is deprecated"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:198
+#: nova/db/sqlalchemy/api.py:212
 #, python-format
 msgid "Unrecognized read_deleted value '%s'"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:516 nova/db/sqlalchemy/api.py:551
+#: nova/db/sqlalchemy/api.py:530 nova/db/sqlalchemy/api.py:565
 #, python-format
 msgid "No ComputeNode for %(host)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4047 nova/db/sqlalchemy/api.py:4073
+#: nova/db/sqlalchemy/api.py:4237 nova/db/sqlalchemy/api.py:4263
 #, python-format
 msgid "No backend config with id %(sm_backend_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4131
+#: nova/db/sqlalchemy/api.py:4321
 #, python-format
 msgid "No sm_flavor called %(sm_flavor)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4175
+#: nova/db/sqlalchemy/api.py:4365
 #, python-format
 msgid "No sm_volume with id %(volume_id)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:66
-msgid "python-migrate is not installed. Exiting."
+#: nova/db/sqlalchemy/migration.py:74
+msgid "version should be an integer"
 msgstr ""
 
-#: nova/db/sqlalchemy/migration.py:78
-msgid "version should be an integer"
+#: nova/db/sqlalchemy/migration.py:100
+msgid "Upgrade DB using Essex release first."
 msgstr ""
 
 #: nova/db/sqlalchemy/session.py:137
@@ -3515,104 +3534,63 @@ msgstr ""
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:48
-msgid "interface column not added to networks table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:80
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:54
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:61
 #: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:48
+#: nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py:58
 #, python-format
 msgid "Table |%s| not created!"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:87
-msgid "VIF column not added to fixed_ips table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/030_multi_nic.py:97
-#, python-format
-msgid "join list for moving mac_addresses |%s|"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:39
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:60
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:61
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:99
-msgid "foreign key constraint couldn't be added"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/031_fk_fixed_ips_virtual_interface_id.py:58
-msgid "foreign key constraint couldn't be dropped"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/045_add_network_priority.py:34
-msgid "priority column not added to networks table"
+#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
+msgid "quota_classes table not dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/047_remove_instances_fk_from_vif.py:41
-#: nova/db/sqlalchemy/migrate_repo/versions/060_remove_network_fk_from_vif.py:42
-#: nova/db/sqlalchemy/migrate_repo/versions/064_change_instance_id_to_uuid_in_instance_actions.py:56
-#: nova/db/sqlalchemy/migrate_repo/versions/070_untie_nova_network_models.py:68
+#: nova/db/sqlalchemy/migrate_repo/versions/088_change_instance_id_to_uuid_in_block_device_mapping.py:57
 msgid "foreign key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/049_add_instances_progress.py:34
-msgid "progress column not added to instances table"
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/055_convert_flavor_id_to_str.py:97
-#, python-format
-msgid ""
-"Could not cast flavorid to integer: %s. Set flavorid to an integer-like "
-"string to downgrade."
-msgstr ""
-
-#: nova/db/sqlalchemy/migrate_repo/versions/062_add_instance_info_cache_table.py:69
-msgid "instance_info_caches tables not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:83
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:127
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:177
+#: nova/db/sqlalchemy/migrate_repo/versions/090_modify_volume_id_datatype.py:235
+msgid "Foreign Key constraint couldn't be removed"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/069_block_migration.py:41
-msgid "progress column not added to compute_nodes table"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:57
+msgid "foreign key could not be dropped"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/072_add_dns_table.py:76
-msgid "dns_domains table not dropped"
+#: nova/db/sqlalchemy/migrate_repo/versions/095_change_fk_instance_id_to_uuid.py:91
+msgid "foreign key could not be created"
 msgstr ""
 
-#: nova/db/sqlalchemy/migrate_repo/versions/083_quota_class.py:60
-msgid "quota_classes table not dropped"
-msgstr ""
-
-#: nova/image/glance.py:147
+#: nova/image/glance.py:148
 msgid "Connection error contacting glance server, retrying"
 msgstr ""
 
-#: nova/image/glance.py:153 nova/network/quantum/melange_connection.py:104
+#: nova/image/glance.py:154 nova/network/quantum/melange_connection.py:104
 msgid "Maximum attempts reached"
 msgstr ""
 
-#: nova/image/glance.py:278
+#: nova/image/glance.py:279
 #, python-format
 msgid "Creating image in Glance. Metadata passed in %s"
 msgstr ""
 
-#: nova/image/glance.py:281
+#: nova/image/glance.py:282
 #, python-format
 msgid "Metadata after formatting for Glance %s"
 msgstr ""
 
-#: nova/image/glance.py:289
+#: nova/image/glance.py:290
 #, python-format
 msgid "Metadata returned from Glance formatted for Base %s"
 msgstr ""
 
-#: nova/image/glance.py:331 nova/image/glance.py:335
+#: nova/image/glance.py:332 nova/image/glance.py:336
 msgid "Not the image owner"
 msgstr ""
 
-#: nova/image/glance.py:410
+#: nova/image/glance.py:411
 #, python-format
 msgid "%(timestamp)s does not follow any of the signatures: %(iso_formats)s"
 msgstr ""
@@ -3671,117 +3649,122 @@ msgstr ""
 msgid "Bad project_id for to_global_ipv6: %s"
 msgstr ""
 
-#: nova/network/ldapdns.py:321
+#: nova/network/ldapdns.py:318
 msgid "This driver only supports type 'a' entries."
 msgstr ""
 
-#: nova/network/linux_net.py:166
+#: nova/network/linux_net.py:167
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: nova/network/linux_net.py:192
+#: nova/network/linux_net.py:193
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: nova/network/linux_net.py:215
+#: nova/network/linux_net.py:216
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: nova/network/linux_net.py:335
+#: nova/network/linux_net.py:336
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: nova/network/linux_net.py:694
+#: nova/network/linux_net.py:698
 #, python-format
 msgid "Hupping dnsmasq threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:696
+#: nova/network/linux_net.py:700
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: nova/network/linux_net.py:756
+#: nova/network/linux_net.py:760
 #, python-format
 msgid "killing radvd threw %s"
 msgstr ""
 
-#: nova/network/linux_net.py:758
+#: nova/network/linux_net.py:762
 #, python-format
 msgid "Pid %d is stale, relaunching radvd"
 msgstr ""
 
-#: nova/network/linux_net.py:967
+#: nova/network/linux_net.py:972
 #, python-format
 msgid "Starting VLAN inteface %s"
 msgstr ""
 
-#: nova/network/linux_net.py:999
+#: nova/network/linux_net.py:1004
 #, python-format
 msgid "Starting Bridge interface for %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1142
+#: nova/network/linux_net.py:1047
+#, python-format
+msgid "Failed to add interface: %s"
+msgstr ""
+
+#: nova/network/linux_net.py:1148
 #, python-format
 msgid "Starting bridge %s "
 msgstr ""
 
-#: nova/network/linux_net.py:1149
+#: nova/network/linux_net.py:1155
 #, python-format
 msgid "Done starting bridge %s"
 msgstr ""
 
-#: nova/network/linux_net.py:1167
+#: nova/network/linux_net.py:1173
 #, python-format
 msgid "Failed unplugging gateway interface '%s'"
 msgstr ""
 
-#: nova/network/linux_net.py:1169
+#: nova/network/linux_net.py:1175
 #, python-format
 msgid "Unplugged gateway interface '%s'"
 msgstr ""
 
-#: nova/network/manager.py:290
+#: nova/network/manager.py:292
 #, python-format
 msgid "Fixed ip %(fixed_ip_id)s not found"
 msgstr ""
 
-#: nova/network/manager.py:299 nova/network/manager.py:494
+#: nova/network/manager.py:301 nova/network/manager.py:509
 #, python-format
 msgid "Interface %(interface)s not found"
 msgstr ""
 
-#: nova/network/manager.py:313
+#: nova/network/manager.py:315
 #, python-format
 msgid "floating IP allocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:351
+#: nova/network/manager.py:353
 #, python-format
 msgid "floating IP deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:384
+#: nova/network/manager.py:386
 #, python-format
 msgid "Address |%(address)s| is not allocated"
 msgstr ""
 
-#: nova/network/manager.py:388
+#: nova/network/manager.py:390
 #, python-format
 msgid "Address |%(address)s| is not allocated to your project |%(project)s|"
 msgstr ""
 
-#: nova/network/manager.py:400
+#: nova/network/manager.py:402
 #, python-format
 msgid "Quota exceeded for %s, tried to allocate address"
 msgstr ""
 
-#: nova/network/manager.py:611
+#: nova/network/manager.py:637
 #, python-format
 msgid ""
 "Database inconsistency: DNS domain |%s| is registered in the Nova db but "
@@ -3789,115 +3772,115 @@ msgid ""
 "ignored."
 msgstr ""
 
-#: nova/network/manager.py:657
+#: nova/network/manager.py:683
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing zone to |%(av_zone)s|."
 msgstr ""
 
-#: nova/network/manager.py:667
+#: nova/network/manager.py:693
 #, python-format
 msgid "Domain |%(domain)s| already exists, changing project to |%(project)s|."
 msgstr ""
 
-#: nova/network/manager.py:775
+#: nova/network/manager.py:801
 #, python-format
 msgid "Disassociated %s stale fixed ip(s)"
 msgstr ""
 
-#: nova/network/manager.py:779
+#: nova/network/manager.py:805
 msgid "setting network host"
 msgstr ""
 
-#: nova/network/manager.py:893
+#: nova/network/manager.py:919
 #, python-format
 msgid "network allocations for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:898
+#: nova/network/manager.py:924
 #, python-format
 msgid "networks retrieved for instance |%(instance_id)s|: |%(networks)s|"
 msgstr ""
 
-#: nova/network/manager.py:927
+#: nova/network/manager.py:953
 #, python-format
 msgid "network deallocation for instance |%s|"
 msgstr ""
 
-#: nova/network/manager.py:1149
+#: nova/network/manager.py:1175
 #, python-format
 msgid ""
 "instance-dns-zone is |%(domain)s|, which is in availability zone "
-"|%(zone)s|. Instance |%(instance)s| is in zone |%(zone2)s|. No DNS record"
-" will be created."
+"|%(zone)s|. Instance is in zone |%(zone2)s|. No DNS record will be "
+"created."
 msgstr ""
 
-#: nova/network/manager.py:1224
+#: nova/network/manager.py:1252
 #, python-format
 msgid "Unable to release %s because vif doesn't exist."
 msgstr ""
 
-#: nova/network/manager.py:1241
+#: nova/network/manager.py:1269
 #, python-format
 msgid "Leased IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1245
+#: nova/network/manager.py:1273
 #, python-format
 msgid "IP %s leased that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1253
+#: nova/network/manager.py:1281
 #, python-format
 msgid "IP |%s| leased that isn't allocated"
 msgstr ""
 
-#: nova/network/manager.py:1258
+#: nova/network/manager.py:1286
 #, python-format
 msgid "Released IP |%(address)s|"
 msgstr ""
 
-#: nova/network/manager.py:1262
+#: nova/network/manager.py:1290
 #, python-format
 msgid "IP %s released that is not associated"
 msgstr ""
 
-#: nova/network/manager.py:1265
+#: nova/network/manager.py:1293
 #, python-format
 msgid "IP %s released that was not leased"
 msgstr ""
 
-#: nova/network/manager.py:1328
+#: nova/network/manager.py:1356
 msgid "cidr already in use"
 msgstr ""
 
-#: nova/network/manager.py:1331
+#: nova/network/manager.py:1359
 #, python-format
 msgid "requested cidr (%(cidr)s) conflicts with existing supernet (%(super)s)"
 msgstr ""
 
-#: nova/network/manager.py:1342
+#: nova/network/manager.py:1370
 #, python-format
 msgid ""
 "requested cidr (%(cidr)s) conflicts with existing smaller cidr "
 "(%(smaller)s)"
 msgstr ""
 
-#: nova/network/manager.py:1401
+#: nova/network/manager.py:1429
 msgid "Network already exists!"
 msgstr ""
 
-#: nova/network/manager.py:1421
+#: nova/network/manager.py:1449
 #, python-format
 msgid "Network must be disassociated from project %s before delete"
 msgstr ""
 
-#: nova/network/manager.py:1825
+#: nova/network/manager.py:1853
 msgid ""
 "The sum between the number of networks and the vlan start cannot be "
 "greater than 4094"
 msgstr ""
 
-#: nova/network/manager.py:1832
+#: nova/network/manager.py:1860
 #, python-format
 msgid ""
 "The network range is not big enough to fit %(num_networks)s. Network size"
@@ -3937,54 +3920,54 @@ msgstr ""
 msgid "unable to deserialize object of type = '%s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:162
+#: nova/network/quantum/manager.py:183
 msgid "QuantumManager does not use 'multi_host' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:166
+#: nova/network/quantum/manager.py:187
 msgid "QuantumManager requires that only one network is created per call"
 msgstr ""
 
-#: nova/network/quantum/manager.py:176
+#: nova/network/quantum/manager.py:197
 msgid "QuantumManager does not use 'vlan_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:182
+#: nova/network/quantum/manager.py:203
 msgid "QuantumManager does not use 'vpn_start' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:186
+#: nova/network/quantum/manager.py:207
 msgid "QuantumManager does not use 'bridge' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:190
+#: nova/network/quantum/manager.py:211
 msgid "QuantumManager does not use 'bridge_interface' parameter."
 msgstr ""
 
-#: nova/network/quantum/manager.py:195
+#: nova/network/quantum/manager.py:216
 msgid "QuantumManager requires a valid (.1) gateway address."
 msgstr ""
 
-#: nova/network/quantum/manager.py:204
+#: nova/network/quantum/manager.py:225
 #, python-format
 msgid ""
 "Unable to find existing quantum network for tenant '%(q_tenant_id)s' with"
 " net-id '%(quantum_net_id)s'"
 msgstr ""
 
-#: nova/network/quantum/manager.py:301
+#: nova/network/quantum/manager.py:333
 #, python-format
 msgid "network allocations for instance %s"
 msgstr ""
 
-#: nova/network/quantum/manager.py:588
+#: nova/network/quantum/manager.py:639
 #, python-format
 msgid ""
 "port deallocation failed for instance: |%(instance_id)s|, port_id: "
 "|%(port_id)s|"
 msgstr ""
 
-#: nova/network/quantum/manager.py:606
+#: nova/network/quantum/manager.py:657
 #, python-format
 msgid ""
 "ipam deallocation failed for instance: |%(instance_id)s|, vif_uuid: "
@@ -4036,89 +4019,89 @@ msgstr ""
 msgid "Deleting port %(port_id)s on net %(net_id)s for %(tenant_id)s"
 msgstr ""
 
-#: nova/notifier/api.py:115
+#: nova/notifier/api.py:121
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: nova/notifier/api.py:130
+#: nova/notifier/api.py:136
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: nova/notifier/list_notifier.py:64
+#: nova/notifier/list_notifier.py:63
 #, python-format
 msgid "Problem '%(e)s' attempting to send to notification driver %(driver)s."
 msgstr ""
 
-#: nova/notifier/rabbit_notifier.py:45
+#: nova/notifier/rabbit_notifier.py:46
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/rpc/amqp.py:183
+#: nova/rpc/amqp.py:198
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:226
+#: nova/rpc/amqp.py:242
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:231
+#: nova/rpc/amqp.py:247
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:232
+#: nova/rpc/amqp.py:248
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:318
+#: nova/rpc/amqp.py:339
 #, python-format
 msgid "Making asynchronous call on %s ..."
 msgstr ""
 
-#: nova/rpc/amqp.py:321
+#: nova/rpc/amqp.py:342
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: nova/rpc/amqp.py:343
+#: nova/rpc/amqp.py:364
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: nova/rpc/amqp.py:351
+#: nova/rpc/amqp.py:372
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: nova/rpc/amqp.py:377
+#: nova/rpc/amqp.py:398
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: nova/rpc/common.py:62
+#: nova/rpc/common.py:43
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: nova/rpc/common.py:79
+#: nova/rpc/common.py:60
 msgid "Timeout while waiting on RPC response."
 msgstr ""
 
-#: nova/rpc/common.py:179
+#: nova/rpc/common.py:161
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:111
+#: nova/rpc/impl_kombu.py:108
 msgid "Failed to process message... skipping it."
 msgstr ""
 
@@ -4146,41 +4129,41 @@ msgid ""
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:385
+#: nova/rpc/impl_kombu.py:533 nova/rpc/impl_qpid.py:386
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:400
+#: nova/rpc/impl_kombu.py:551 nova/rpc/impl_qpid.py:401
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:404
+#: nova/rpc/impl_kombu.py:555 nova/rpc/impl_qpid.py:405
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:434
+#: nova/rpc/impl_kombu.py:589 nova/rpc/impl_qpid.py:435
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:341
+#: nova/rpc/impl_qpid.py:342
 #, python-format
 msgid "Unable to connect to AMQP server: %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:346
+#: nova/rpc/impl_qpid.py:347
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:354
+#: nova/rpc/impl_qpid.py:355
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: nova/rpc/impl_qpid.py:412
+#: nova/rpc/impl_qpid.py:413
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
@@ -4193,59 +4176,59 @@ msgstr ""
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:63
+#: nova/scheduler/driver.py:65
 #, python-format
 msgid "Casted '%(method)s' to volume '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:80
+#: nova/scheduler/driver.py:82
 #, python-format
 msgid "Casted '%(method)s' to compute '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:89
+#: nova/scheduler/driver.py:91
 #, python-format
 msgid "Casted '%(method)s' to network '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:107
+#: nova/scheduler/driver.py:109
 #, python-format
 msgid "Casted '%(method)s' to %(topic)s '%(host)s'"
 msgstr ""
 
-#: nova/scheduler/driver.py:181
+#: nova/scheduler/driver.py:183
 msgid "Must implement a fallback schedule"
 msgstr ""
 
-#: nova/scheduler/driver.py:185
+#: nova/scheduler/driver.py:187
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:190
+#: nova/scheduler/driver.py:192
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:325
+#: nova/scheduler/driver.py:316
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:330
+#: nova/scheduler/driver.py:321
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/scheduler/driver.py:367
+#: nova/scheduler/driver.py:358
 #, python-format
 msgid "host %(dest)s is not compatible with original host %(src)s."
 msgstr ""
 
-#: nova/scheduler/driver.py:416
+#: nova/scheduler/driver.py:407
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
 "memory(host:%(avail)s <= instance:%(mem_inst)s)"
 msgstr ""
 
-#: nova/scheduler/driver.py:467
+#: nova/scheduler/driver.py:458
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
@@ -4310,21 +4293,21 @@ msgstr ""
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/manager.py:85
+#: nova/scheduler/manager.py:86
 #, python-format
 msgid ""
 "Driver Method %(driver_method_name)s missing: %(e)s. Reverting to "
 "schedule()"
 msgstr ""
 
-#: nova/scheduler/manager.py:150
+#: nova/scheduler/manager.py:151
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
 
-#: nova/scheduler/manager.py:159
+#: nova/scheduler/manager.py:160
 #, python-format
-msgid "Setting instance %(instance_uuid)s to %(state)s state."
+msgid "Setting instance to %(state)s state."
 msgstr ""
 
 #: nova/scheduler/scheduler_options.py:66
@@ -4369,29 +4352,29 @@ msgstr ""
 msgid "Reply to faked command is stdout='%(stdout)s' stderr='%(stderr)s'"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:784
+#: nova/tests/fakelibvirt.py:779
 msgid "Please extend mock libvirt module to support flags"
 msgstr ""
 
-#: nova/tests/fakelibvirt.py:790
+#: nova/tests/fakelibvirt.py:785
 msgid "Please extend fake libvirt module to support this auth method"
 msgstr ""
 
-#: nova/tests/test_compute.py:364 nova/tests/test_compute.py:1418
+#: nova/tests/test_compute.py:365 nova/tests/test_compute.py:1554
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:370
+#: nova/tests/test_compute.py:371
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/test_compute.py:588
+#: nova/tests/test_compute.py:608
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/test_compute.py:1429
+#: nova/tests/test_compute.py:1565
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
@@ -4439,12 +4422,12 @@ msgstr ""
 msgid "uuid"
 msgstr ""
 
-#: nova/tests/test_volume.py:216
+#: nova/tests/test_volume.py:234
 #, python-format
 msgid "Target %s allocated"
 msgstr ""
 
-#: nova/tests/test_volume.py:468
+#: nova/tests/test_volume.py:488
 #, python-format
 msgid "Cannot confirm exported volume id:%s."
 msgstr ""
@@ -4459,19 +4442,18 @@ msgstr ""
 msgid "Result data: %s"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:623
+#: nova/tests/test_xenapi.py:639
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/test_xenapi.py:634
+#: nova/tests/test_xenapi.py:650
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/test_servers.py:2144
-#, python-format
-msgid "Quota exceeded: code=%(code)s"
+#: nova/tests/api/openstack/compute/test_servers.py:2344
+msgid "Quota exceeded: already used 1 of 1 instances"
 msgstr ""
 
 #: nova/tests/api/openstack/compute/contrib/test_snapshots.py:57
@@ -4494,32 +4476,32 @@ msgstr ""
 msgid "_get_all: %s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:125
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:124
 #, python-format
 msgid "test_snapshot_create: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:134
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:133
 #, python-format
 msgid "test_snapshot_create: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:156
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:155
 #, python-format
 msgid "test_snapshot_create_force: param=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:165
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:164
 #, python-format
 msgid "test_snapshot_create_force: resp_dict=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:205
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:204
 #, python-format
 msgid "test_snapshot_show: resp=%s"
 msgstr ""
 
-#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:231
+#: nova/tests/api/openstack/compute/contrib/test_snapshots.py:230
 #, python-format
 msgid "test_snapshot_detail: resp_dict=%s"
 msgstr ""
@@ -4578,21 +4560,21 @@ msgstr ""
 msgid "Decoding JSON: %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:110
+#: nova/tests/rpc/common.py:135
 #, python-format
 msgid "Nested received %(queue)s, %(value)s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:119
+#: nova/tests/rpc/common.py:144
 #, python-format
 msgid "Nested return %s"
 msgstr ""
 
-#: nova/tests/rpc/common.py:137
+#: nova/tests/rpc/common.py:165
 msgid "RPC backend does not support timeouts"
 msgstr ""
 
-#: nova/tests/rpc/common.py:204 nova/tests/rpc/common.py:210
+#: nova/tests/rpc/common.py:235 nova/tests/rpc/common.py:241
 #, python-format
 msgid "Received %s"
 msgstr ""
@@ -4601,26 +4583,24 @@ msgstr ""
 msgid "Failed to open connection to the hypervisor"
 msgstr ""
 
-#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:707
-#: nova/virt/libvirt/connection.py:2048 nova/virt/xenapi/connection.py:397
+#: nova/virt/fake.py:270 nova/virt/baremetal/proxy.py:719
+#: nova/virt/libvirt/connection.py:2061 nova/virt/xenapi/connection.py:422
 #, python-format
 msgid "Compute_service record created for %s "
 msgstr ""
 
-#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:711
-#: nova/virt/libvirt/connection.py:2051 nova/virt/xenapi/connection.py:400
+#: nova/virt/fake.py:273 nova/virt/baremetal/proxy.py:723
+#: nova/virt/libvirt/connection.py:2064 nova/virt/xenapi/connection.py:425
 #, python-format
 msgid "Compute_service record updated for %s "
 msgstr ""
 
-#: nova/virt/firewall.py:130
-#, python-format
-msgid "Attempted to unfilter instance %s which is not filtered"
+#: nova/virt/firewall.py:130 nova/virt/libvirt/firewall.py:252
+msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
 #: nova/virt/firewall.py:137
-#, python-format
-msgid "Filters added to instance %s"
+msgid "Filters added to instance"
 msgstr ""
 
 #: nova/virt/firewall.py:139
@@ -4632,7 +4612,7 @@ msgstr ""
 msgid "Adding security group rule: %r"
 msgstr ""
 
-#: nova/virt/firewall.py:403 nova/virt/xenapi/firewall.py:87
+#: nova/virt/firewall.py:404 nova/virt/xenapi/firewall.py:87
 #, python-format
 msgid "Adding provider rule: %s"
 msgstr ""
@@ -4657,27 +4637,27 @@ msgid ""
 "vmwareapi_host_password to useconnection_type=vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:276
+#: nova/virt/vmwareapi_conn.py:277
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:359
+#: nova/virt/vmwareapi_conn.py:360
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:398
+#: nova/virt/vmwareapi_conn.py:395
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:404
+#: nova/virt/vmwareapi_conn.py:400
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi_conn.py:409
+#: nova/virt/vmwareapi_conn.py:404
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -4805,99 +4785,99 @@ msgstr ""
 msgid "instance %s: rebooted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:183
+#: nova/virt/baremetal/proxy.py:184
 msgid "_wait_for_reboot failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:213
+#: nova/virt/baremetal/proxy.py:214
 #, python-format
 msgid "instance %s: rescued"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:216
+#: nova/virt/baremetal/proxy.py:218
 msgid "_wait_for_rescue failed"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:233
+#: nova/virt/baremetal/proxy.py:235
 msgid "<============= spawn of baremetal =============>"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:246
+#: nova/virt/baremetal/proxy.py:248
 #, python-format
 msgid "instance %s: is building"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:251
+#: nova/virt/baremetal/proxy.py:254
 msgid "Key is injected but instance is not running yet"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:256
+#: nova/virt/baremetal/proxy.py:260
 #, python-format
 msgid "instance %s: booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:259
+#: nova/virt/baremetal/proxy.py:264
 #, python-format
 msgid "~~~~~~ current state = %s ~~~~~~"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:260
+#: nova/virt/baremetal/proxy.py:266
 #, python-format
 msgid "instance %s spawned successfully"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:263
+#: nova/virt/baremetal/proxy.py:269
 #, python-format
 msgid "instance %s:not booted"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:265
+#: nova/virt/baremetal/proxy.py:272
 msgid "Bremetal assignment is overcommitted."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:345
+#: nova/virt/baremetal/proxy.py:353
 #, python-format
 msgid "instance %s: Creating image"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:464
+#: nova/virt/baremetal/proxy.py:473
 #, python-format
 msgid "instance %(inst_name)s: injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:475
+#: nova/virt/baremetal/proxy.py:484
 #, python-format
 msgid ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:520
+#: nova/virt/baremetal/proxy.py:530
 #, python-format
 msgid "instance %s: starting toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:522
+#: nova/virt/baremetal/proxy.py:533
 #, python-format
 msgid "instance %s: finished toXML method"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:565 nova/virt/libvirt/connection.py:1818
+#: nova/virt/baremetal/proxy.py:577 nova/virt/libvirt/connection.py:1831
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:705
+#: nova/virt/baremetal/proxy.py:717
 #, python-format
 msgid "#### RLK: cpu_arch = %s "
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:737
+#: nova/virt/baremetal/proxy.py:749
 msgid "Updating!"
 msgstr ""
 
-#: nova/virt/baremetal/proxy.py:764 nova/virt/libvirt/connection.py:2612
+#: nova/virt/baremetal/proxy.py:776 nova/virt/libvirt/connection.py:2621
 #: nova/virt/xenapi/host.py:129
 msgid "Updating host stats"
 msgstr ""
@@ -4949,32 +4929,32 @@ msgstr ""
 msgid "no capable image handler configured"
 msgstr ""
 
-#: nova/virt/disk/api.py:178
+#: nova/virt/disk/api.py:179
 #, python-format
 msgid "unknown disk image handler: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:189
+#: nova/virt/disk/api.py:191
 msgid "image already mounted"
 msgstr ""
 
-#: nova/virt/disk/api.py:276 nova/virt/disk/guestfs.py:64
-#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:100
+#: nova/virt/disk/api.py:278 nova/virt/disk/guestfs.py:64
+#: nova/virt/disk/guestfs.py:78 nova/virt/disk/mount.py:102
 #, python-format
 msgid "Failed to mount filesystem: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:291
+#: nova/virt/disk/api.py:293
 #, python-format
 msgid "Failed to remove container: %s"
 msgstr ""
 
-#: nova/virt/disk/api.py:441
+#: nova/virt/disk/api.py:443
 #, python-format
 msgid "User %(username)s not found in password file."
 msgstr ""
 
-#: nova/virt/disk/api.py:457
+#: nova/virt/disk/api.py:459
 #, python-format
 msgid "User %(username)s not found in shadow file."
 msgstr ""
@@ -4993,11 +4973,17 @@ msgstr ""
 msgid "Could not attach image to loopback: %s"
 msgstr ""
 
-#: nova/virt/disk/mount.py:76
-msgid "no partitions found"
+#: nova/virt/disk/mount.py:62
+#, python-format
+msgid "partition search unsupported with %s"
+msgstr ""
+
+#: nova/virt/disk/mount.py:78
+#, python-format
+msgid "partition %s not found"
 msgstr ""
 
-#: nova/virt/disk/mount.py:77
+#: nova/virt/disk/mount.py:79
 #, python-format
 msgid "Failed to map partitions: %s"
 msgstr ""
@@ -5020,183 +5006,183 @@ msgstr ""
 msgid "nbd device %s did not show up"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:268
+#: nova/virt/libvirt/connection.py:280
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:289
+#: nova/virt/libvirt/connection.py:301
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:391
+#: nova/virt/libvirt/connection.py:403
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:403
+#: nova/virt/libvirt/connection.py:415
 #, python-format
 msgid ""
 "Error from libvirt during saved instance removal. Code=%(errcode)s "
 "Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:414
+#: nova/virt/libvirt/connection.py:426
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:426
+#: nova/virt/libvirt/connection.py:438
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:438
+#: nova/virt/libvirt/connection.py:450
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:464
+#: nova/virt/libvirt/connection.py:476
 #, python-format
 msgid "Deleting instance files %(target)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:475 nova/virt/xenapi/connection.py:329
+#: nova/virt/libvirt/connection.py:487
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:557
+#: nova/virt/libvirt/connection.py:570
 msgid "attaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:570
+#: nova/virt/libvirt/connection.py:583
 msgid "detaching LXC block device"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:695
+#: nova/virt/libvirt/connection.py:708
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:699
+#: nova/virt/libvirt/connection.py:712
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:728
+#: nova/virt/libvirt/connection.py:741
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:764
+#: nova/virt/libvirt/connection.py:777
 msgid "During reboot, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:769
+#: nova/virt/libvirt/connection.py:782
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:870 nova/virt/xenapi/vmops.py:1324
+#: nova/virt/libvirt/connection.py:880 nova/virt/xenapi/vmops.py:1321
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:874
+#: nova/virt/libvirt/connection.py:886
 #, python-format
 msgid "Automatically confirming migration %d"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:899
+#: nova/virt/libvirt/connection.py:911
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:908
+#: nova/virt/libvirt/connection.py:920
 msgid "During spawn, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:913
+#: nova/virt/libvirt/connection.py:925
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:929
+#: nova/virt/libvirt/connection.py:941
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:981
+#: nova/virt/libvirt/connection.py:993
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "使用者並沒有管理者權力"
 
-#: nova/virt/libvirt/connection.py:1023
+#: nova/virt/libvirt/connection.py:1037
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1027
+#: nova/virt/libvirt/connection.py:1041
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1031 nova/virt/libvirt/connection.py:1035
+#: nova/virt/libvirt/connection.py:1045 nova/virt/libvirt/connection.py:1049
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1156
+#: nova/virt/libvirt/connection.py:1174
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1342
+#: nova/virt/libvirt/connection.py:1358
 #, python-format
 msgid "Injecting %(injection)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1352
+#: nova/virt/libvirt/connection.py:1368
 #, python-format
 msgid "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1384
+#: nova/virt/libvirt/connection.py:1400
 #, python-format
 msgid "block_device_list %s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1661
+#: nova/virt/libvirt/connection.py:1689
 msgid "Starting toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1665
+#: nova/virt/libvirt/connection.py:1693
 msgid "Finished toXML method"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1682
+#: nova/virt/libvirt/connection.py:1710
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1923
+#: nova/virt/libvirt/connection.py:1936
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1945
+#: nova/virt/libvirt/connection.py:1958
 #, python-format
 msgid "'<cpu>' must be 1, but %d\n"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:1972
+#: nova/virt/libvirt/connection.py:1985
 #, python-format
 msgid "topology (%(topology)s) must have %(ks)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2070
+#: nova/virt/libvirt/connection.py:2083
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2082
+#: nova/virt/libvirt/connection.py:2095
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -5206,42 +5192,39 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2139
+#: nova/virt/libvirt/connection.py:2150
 #, python-format
 msgid "Timeout migrating for %s. nwfilter not found."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2355
+#: nova/virt/libvirt/connection.py:2366
 #, python-format
 msgid "skipping %(path)s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2410
+#: nova/virt/libvirt/connection.py:2421
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2461
-#, python-format
-msgid "Instance %s: Starting migrate_disk_and_power_off"
+#: nova/virt/libvirt/connection.py:2472
+msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2516
+#: nova/virt/libvirt/connection.py:2527
 msgid "During wait running, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2521
+#: nova/virt/libvirt/connection.py:2532
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2528
-#, python-format
-msgid "Instance %s: Starting finish_migration"
+#: nova/virt/libvirt/connection.py:2538
+msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/connection.py:2568
-#, python-format
-msgid "Instance %s: Starting finish_revert_migration"
+#: nova/virt/libvirt/connection.py:2577
+msgid "Starting finish_revert_migration"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:42
@@ -5272,151 +5255,171 @@ msgstr ""
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:252
-msgid "Attempted to unfilter instance which is not filtered"
-msgstr ""
-
-#: nova/virt/libvirt/imagecache.py:170
+#: nova/virt/libvirt/imagecache.py:159
 #, python-format
 msgid "%s is a valid instance name"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:173
+#: nova/virt/libvirt/imagecache.py:162
 #, python-format
 msgid "%s has a disk file"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:175
+#: nova/virt/libvirt/imagecache.py:164
 #, python-format
 msgid "Instance %(instance)s is backed by %(backing)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:186
+#: nova/virt/libvirt/imagecache.py:176
 #, python-format
 msgid ""
 "Instance %(instance)s is using a backing file %(backing)s which does not "
 "appear in the image service"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:237
+#: nova/virt/libvirt/imagecache.py:227
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification failed"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:247
+#: nova/virt/libvirt/imagecache.py:237
 #, python-format
 msgid "%(id)s (%(base_file)s): image verification skipped, no hash stored"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:266
+#: nova/virt/libvirt/imagecache.py:256
 #, python-format
 msgid "Cannot remove %(base_file)s, it does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:278
+#: nova/virt/libvirt/imagecache.py:268
 #, python-format
 msgid "Base file too young to remove: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:281
+#: nova/virt/libvirt/imagecache.py:271
 #, python-format
 msgid "Removing base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:288
+#: nova/virt/libvirt/imagecache.py:278
 #, python-format
 msgid "Failed to remove %(base_file)s, error was %(error)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:299
+#: nova/virt/libvirt/imagecache.py:289
 #, python-format
 msgid "%(id)s (%(base_file)s): checking"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:318
+#: nova/virt/libvirt/imagecache.py:308
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): in use: on this node %(local)d local, %(remote)d "
 "on other nodes"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:330
+#: nova/virt/libvirt/imagecache.py:320
 #, python-format
 msgid ""
 "%(id)s (%(base_file)s): warning -- an absent base file is in use! "
 "instances: %(instance_list)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:338
+#: nova/virt/libvirt/imagecache.py:328
 #, python-format
 msgid "%(id)s (%(base_file)s): in use on (%(remote)d on other nodes)"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:348
+#: nova/virt/libvirt/imagecache.py:338
 #, python-format
 msgid "%(id)s (%(base_file)s): image is not in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:354
+#: nova/virt/libvirt/imagecache.py:344
 #, python-format
 msgid "%(id)s (%(base_file)s): image is in use"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:377
+#: nova/virt/libvirt/imagecache.py:367
 #, python-format
 msgid "Skipping verification, no base directory at %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:381
+#: nova/virt/libvirt/imagecache.py:371
 msgid "Verify base images"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:388
+#: nova/virt/libvirt/imagecache.py:378
 #, python-format
 msgid "Image id %(id)s yields fingerprint %(fingerprint)s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:406
+#: nova/virt/libvirt/imagecache.py:396
 #, python-format
 msgid "Unknown base file: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:411
+#: nova/virt/libvirt/imagecache.py:401
 #, python-format
 msgid "Active base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:414
+#: nova/virt/libvirt/imagecache.py:404
 #, python-format
 msgid "Corrupt base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:418
+#: nova/virt/libvirt/imagecache.py:408
 #, python-format
 msgid "Removable base files: %s"
 msgstr ""
 
-#: nova/virt/libvirt/imagecache.py:426
+#: nova/virt/libvirt/imagecache.py:416
 msgid "Verification complete"
 msgstr ""
 
-#: nova/virt/libvirt/utils.py:264
+#: nova/virt/libvirt/utils.py:282
 msgid "Unable to find an open port"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:90
+#: nova/virt/libvirt/utils.py:360
+#, python-format
+msgid "Reading image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:364
+#, python-format
+msgid "Read: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:370
+#, python-format
+msgid "Error reading image info file %(filename)s: %(error)s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:394
+#, python-format
+msgid "Writing image info file: %s"
+msgstr ""
+
+#: nova/virt/libvirt/utils.py:395
+#, python-format
+msgid "Wrote: %s"
+msgstr ""
+
+#: nova/virt/libvirt/vif.py:91
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:99
+#: nova/virt/libvirt/vif.py:101
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:165 nova/virt/libvirt/vif.py:220
-#, python-format
-msgid "Failed while unplugging vif of instance '%s'"
+#: nova/virt/libvirt/vif.py:168 nova/virt/libvirt/vif.py:224
+msgid "Failed while unplugging vif"
 msgstr ""
 
 #: nova/virt/libvirt/volume.py:163
@@ -5448,32 +5451,32 @@ msgstr ""
 
 #: nova/virt/vmwareapi/fake.py:131
 #, python-format
-msgid "Property %(attr)s not set for the managed object %(objName)s"
+msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:437
+#: nova/virt/vmwareapi/fake.py:436
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:439 nova/virt/vmwareapi/fake.py:609
+#: nova/virt/vmwareapi/fake.py:438 nova/virt/vmwareapi/fake.py:608
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:502
+#: nova/virt/vmwareapi/fake.py:501
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:517
+#: nova/virt/vmwareapi/fake.py:516
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:520
+#: nova/virt/vmwareapi/fake.py:519
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:606
+#: nova/virt/vmwareapi/fake.py:605
 msgid " No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -5555,23 +5558,21 @@ msgid "Couldn't get a local Datastore reference"
 msgstr ""
 
 #: nova/virt/vmwareapi/vmops.py:196
-#, python-format
-msgid "Creating VM with the name %s on the ESX  host"
+msgid "Creating VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:205
-#, python-format
-msgid "Created VM with the name %s on the ESX  host"
+#: nova/virt/vmwareapi/vmops.py:204
+msgid "Created VM on the ESX  host"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:234
+#: nova/virt/vmwareapi/vmops.py:232
 #, python-format
 msgid ""
 "Creating Virtual Disk of size  %(vmdk_file_size_in_kb)s KB and adapter "
 "type  %(adapter_type)s on the ESX host local store %(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:251
+#: nova/virt/vmwareapi/vmops.py:250
 #, python-format
 msgid ""
 "Created Virtual Disk of size %(vmdk_file_size_in_kb)s KB on the ESX host "
@@ -5585,225 +5586,199 @@ msgid ""
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:272
+#: nova/virt/vmwareapi/vmops.py:273
 #, python-format
 msgid ""
 "Deleted the file %(flat_uploaded_vmdk_path)s on the ESX host local store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:283
+#: nova/virt/vmwareapi/vmops.py:285
 #, python-format
 msgid ""
 "Downloading image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:298
+#: nova/virt/vmwareapi/vmops.py:301
 #, python-format
 msgid ""
 "Downloaded image file data %(image_ref)s to the ESX data store "
 "%(data_store_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:315
-#, python-format
-msgid "Reconfiguring VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:319
+msgid "Reconfiguring VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:322
-#, python-format
-msgid "Reconfigured VM instance %s to attach the image disk"
+#: nova/virt/vmwareapi/vmops.py:326
+msgid "Reconfigured VM instance to attach the image disk"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:329
-#, python-format
-msgid "Powering on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:333
+msgid "Powering on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:335
-#, python-format
-msgid "Powered on the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:339
+msgid "Powered on the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:381
-#, python-format
-msgid "Creating Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:385
+msgid "Creating Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:391
-#, python-format
-msgid "Created Snapshot of the VM instance %s "
+#: nova/virt/vmwareapi/vmops.py:395
+msgid "Created Snapshot of the VM instance"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:434
-#, python-format
-msgid "Copying disk data before snapshot of the VM  instance %s"
+#: nova/virt/vmwareapi/vmops.py:438
+msgid "Copying disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:447
-#, python-format
-msgid "Copied disk data before snapshot of the VM instance %s"
+#: nova/virt/vmwareapi/vmops.py:451
+msgid "Copied disk data before snapshot of the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:456
+#: nova/virt/vmwareapi/vmops.py:460
 #, python-format
 msgid "Uploading image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:469
+#: nova/virt/vmwareapi/vmops.py:474
 #, python-format
 msgid "Uploaded image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:479
+#: nova/virt/vmwareapi/vmops.py:485
 #, python-format
 msgid "Deleting temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:488
+#: nova/virt/vmwareapi/vmops.py:494
 #, python-format
 msgid "Deleted temporary vmdk file %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:520
+#: nova/virt/vmwareapi/vmops.py:526
 msgid "instance is not powered on"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:527
-#, python-format
-msgid "Rebooting guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:533
+msgid "Rebooting guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:530
-#, python-format
-msgid "Rebooted guest OS of VM %s"
+#: nova/virt/vmwareapi/vmops.py:536
+msgid "Rebooted guest OS of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:532
-#, python-format
-msgid "Doing hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:538
+msgid "Doing hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:536
-#, python-format
-msgid "Did hard reboot of VM %s"
+#: nova/virt/vmwareapi/vmops.py:542
+msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:548
-#, python-format
-msgid "instance - %s not present"
+#: nova/virt/vmwareapi/vmops.py:554
+msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:567
-#, python-format
-msgid "Powering off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:573
+msgid "Powering off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:572
-#, python-format
-msgid "Powered off the VM %s"
+#: nova/virt/vmwareapi/vmops.py:578
+msgid "Powered off the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:576
-#, python-format
-msgid "Unregistering the VM %s"
+#: nova/virt/vmwareapi/vmops.py:582
+msgid "Unregistering the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:579
-#, python-format
-msgid "Unregistered the VM %s"
+#: nova/virt/vmwareapi/vmops.py:585
+msgid "Unregistered the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:581
+#: nova/virt/vmwareapi/vmops.py:587
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:592
+#: nova/virt/vmwareapi/vmops.py:599
 #, python-format
-msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleting contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:602
+#: nova/virt/vmwareapi/vmops.py:609
 #, python-format
-msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+msgid "Deleted contents of the VM from datastore %(datastore_name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:607
+#: nova/virt/vmwareapi/vmops.py:614
 #, python-format
 msgid ""
 "In vmwareapi:vmops:destroy, got this exception while deleting the VM "
 "contents from the disk: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:615
+#: nova/virt/vmwareapi/vmops.py:623
 msgid "pause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:619
+#: nova/virt/vmwareapi/vmops.py:627
 msgid "unpause not supported for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:633
-#, python-format
-msgid "Suspending the VM %s "
+#: nova/virt/vmwareapi/vmops.py:641
+msgid "Suspending the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:637
-#, python-format
-msgid "Suspended the VM %s "
+#: nova/virt/vmwareapi/vmops.py:645
+msgid "Suspended the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:640
+#: nova/virt/vmwareapi/vmops.py:648
 msgid "instance is powered off and can not be suspended."
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:643
-#, python-format
-msgid "VM %s was already in suspended state. So returning without doing anything"
+#: nova/virt/vmwareapi/vmops.py:651
+msgid "VM was already in suspended state. So returning without doing anything"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:656
-#, python-format
-msgid "Resuming the VM %s"
+#: nova/virt/vmwareapi/vmops.py:664
+msgid "Resuming the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:661
-#, python-format
-msgid "Resumed the VM %s "
+#: nova/virt/vmwareapi/vmops.py:669
+msgid "Resumed the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:663
+#: nova/virt/vmwareapi/vmops.py:671
 msgid "instance is not in a suspended state"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:699
+#: nova/virt/vmwareapi/vmops.py:707
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:757
+#: nova/virt/vmwareapi/vmops.py:765
 #, python-format
-msgid ""
-"Reconfiguring VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:765
+#: nova/virt/vmwareapi/vmops.py:773
 #, python-format
-msgid ""
-"Reconfigured VM instance %(name)s to set the machine id with ip - "
-"%(ip_addr)s"
+msgid "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:802
+#: nova/virt/vmwareapi/vmops.py:810
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:806
+#: nova/virt/vmwareapi/vmops.py:814
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -5813,76 +5788,90 @@ msgstr ""
 msgid "Downloading image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:103
+#: nova/virt/vmwareapi/vmware_images.py:104
 #, python-format
 msgid "Downloaded image %s from glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:108
+#: nova/virt/vmwareapi/vmware_images.py:110
 #, python-format
 msgid "Uploading image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:129
+#: nova/virt/vmwareapi/vmware_images.py:132
 #, python-format
 msgid "Uploaded image %s to the Glance image server"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:139
+#: nova/virt/vmwareapi/vmware_images.py:143
 #, python-format
 msgid "Getting image size for the image %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmware_images.py:143
+#: nova/virt/vmwareapi/vmware_images.py:148
 #, python-format
 msgid "Got image size of %(size)s for the image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:140
+#: nova/virt/xenapi/connection.py:145
 msgid ""
 "Must specify xenapi_connection_url, xenapi_connection_username "
 "(optionally), and xenapi_connection_password to use "
 "connection_type=xenapi"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:461
+#: nova/virt/xenapi/connection.py:179
+msgid "Failure while cleaning up attached VDIs"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:353
+#, python-format
+msgid "Could not determine key: %s"
+msgstr ""
+
+#: nova/virt/xenapi/connection.py:486
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:490
+#: nova/virt/xenapi/connection.py:515
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:528
+#: nova/virt/xenapi/connection.py:553
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/connection.py:600 nova/virt/xenapi/connection.py:613
+#: nova/virt/xenapi/connection.py:625 nova/virt/xenapi/connection.py:638
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:565 nova/virt/xenapi/fake.py:664
-#: nova/virt/xenapi/fake.py:682 nova/virt/xenapi/fake.py:744
+#: nova/virt/xenapi/fake.py:570 nova/virt/xenapi/fake.py:672
+#: nova/virt/xenapi/fake.py:691 nova/virt/xenapi/fake.py:753
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:567
+#: nova/virt/xenapi/fake.py:572
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:601
+#: nova/virt/xenapi/fake.py:606
 #, python-format
 msgid "Calling %(localname)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:606
+#: nova/virt/xenapi/fake.py:611
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:666
+#: nova/virt/xenapi/fake.py:614
+#, python-format
+msgid "Calling setter %s"
+msgstr ""
+
+#: nova/virt/xenapi/fake.py:674
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -5972,512 +5961,512 @@ msgid ""
 "Expected %(vlan_num)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:218
+#: nova/virt/xenapi/vm_utils.py:219
 msgid "Created VM"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:245
+#: nova/virt/xenapi/vm_utils.py:246
 #, python-format
 msgid "VBD not found in instance %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:262
+#: nova/virt/xenapi/vm_utils.py:263
 #, python-format
 msgid "VBD %s already detached"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:265
+#: nova/virt/xenapi/vm_utils.py:266
 #, python-format
 msgid "VBD %(vbd_ref)s detach rejected, attempt %(num_attempt)d/%(max_attempts)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:270
+#: nova/virt/xenapi/vm_utils.py:271
 #, python-format
 msgid "Unable to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:275
+#: nova/virt/xenapi/vm_utils.py:276
 #, python-format
 msgid "Reached maximum number of retries trying to unplug VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:286
+#: nova/virt/xenapi/vm_utils.py:287
 #, python-format
 msgid "Unable to destroy VBD %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:305
+#: nova/virt/xenapi/vm_utils.py:306
 #, python-format
 msgid "Creating %(vbd_type)s-type VBD for VM %(vm_ref)s, VDI %(vdi_ref)s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:308
+#: nova/virt/xenapi/vm_utils.py:309
 #, python-format
 msgid "Created VBD %(vbd_ref)s for VM %(vm_ref)s, VDI %(vdi_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:319
+#: nova/virt/xenapi/vm_utils.py:320
 #, python-format
 msgid "Unable to destroy VDI %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:337
+#: nova/virt/xenapi/vm_utils.py:339
 #, python-format
 msgid ""
 "Created VDI %(vdi_ref)s (%(name_label)s, %(virtual_size)s, %(read_only)s)"
 " on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:346
+#: nova/virt/xenapi/vm_utils.py:348
 #, python-format
 msgid "Copied VDI %(vdi_ref)s from VDI %(vdi_to_copy_ref)s on %(sr_ref)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:354
+#: nova/virt/xenapi/vm_utils.py:356
 #, python-format
 msgid "Cloned VDI %(vdi_ref)s from VDI %(vdi_to_clone_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:375
+#: nova/virt/xenapi/vm_utils.py:377
 #, python-format
 msgid "No primary VDI found for %(vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:382
+#: nova/virt/xenapi/vm_utils.py:384
 #, python-format
 msgid "Snapshotting with label '%(label)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:395
+#: nova/virt/xenapi/vm_utils.py:397
 #, python-format
 msgid "Created snapshot %(template_vm_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:434
+#: nova/virt/xenapi/vm_utils.py:436
 #, python-format
 msgid "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:612
+#: nova/virt/xenapi/vm_utils.py:614
 #, python-format
 msgid ""
 "Fast cloning is only supported on default local SR of type ext. SR on "
 "this system was found to be of type %(sr_type)s. Ignoring the cow flag."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:725
+#: nova/virt/xenapi/vm_utils.py:727
 #, python-format
 msgid ""
 "download_vhd %(image)s attempt %(attempt_num)d/%(max_attempts)d from "
 "%(glance_host)s:%(glance_port)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:735
+#: nova/virt/xenapi/vm_utils.py:737
 #, python-format
 msgid "download_vhd failed: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:751
+#: nova/virt/xenapi/vm_utils.py:753
 #, python-format
 msgid "Asking xapi to fetch vhd image %(image)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:761
+#: nova/virt/xenapi/vm_utils.py:763
 #, python-format
 msgid ""
 "xapi 'download_vhd' returned VDI of type '%(vdi_type)s' with UUID "
 "'%(vdi_uuid)s'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:789
+#: nova/virt/xenapi/vm_utils.py:791
 #, python-format
 msgid "vdi_uuid=%(cur_vdi_uuid)s vdi_size_bytes=%(vdi_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:805
+#: nova/virt/xenapi/vm_utils.py:807
 #, python-format
 msgid "image_size_bytes=%(size_bytes)d, allowed_size_bytes=%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:809
+#: nova/virt/xenapi/vm_utils.py:811
 #, python-format
 msgid ""
 "Image size %(size_bytes)d exceeded instance_type allowed size "
 "%(allowed_size_bytes)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:831
+#: nova/virt/xenapi/vm_utils.py:833
 #, python-format
 msgid "Fetching image %(image)s, type %(image_type_str)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:844
+#: nova/virt/xenapi/vm_utils.py:846
 #, python-format
 msgid "Size for image %(image)s: %(virtual_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:853
+#: nova/virt/xenapi/vm_utils.py:855
 #, python-format
 msgid ""
 "Kernel/Ramdisk image is too large: %(vdi_size)d bytes, max %(max_size)d "
 "bytes"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:871
+#: nova/virt/xenapi/vm_utils.py:872
 #, python-format
 msgid "Copying VDI %s to /boot/guest on dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:885
+#: nova/virt/xenapi/vm_utils.py:886
 #, python-format
 msgid "Kernel/Ramdisk VDI %s destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:896
+#: nova/virt/xenapi/vm_utils.py:897
 msgid "Failed to fetch glance image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:935
+#: nova/virt/xenapi/vm_utils.py:936
 #, python-format
 msgid "Detected %(image_type_str)s format for image %(image_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:956
+#: nova/virt/xenapi/vm_utils.py:957
 #, python-format
 msgid "Looking up vdi %s for PV kernel"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:974
+#: nova/virt/xenapi/vm_utils.py:975
 #, python-format
 msgid "Unknown image format %(disk_image_type)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1017
+#: nova/virt/xenapi/vm_utils.py:1018
 #, python-format
 msgid "VDI %s is still available"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1060
-#, python-format
-msgid "(VM_UTILS) xenserver vm state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1062
-#, python-format
-msgid "(VM_UTILS) xenapi power_state -> |%s|"
-msgstr ""
-
-#: nova/virt/xenapi/vm_utils.py:1089
+#: nova/virt/xenapi/vm_utils.py:1086
 #, python-format
 msgid "Unable to parse rrd of %(vm_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1109
+#: nova/virt/xenapi/vm_utils.py:1106
 #, python-format
 msgid "Re-scanning SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1137
+#: nova/virt/xenapi/vm_utils.py:1134
 #, python-format
 msgid "Flag sr_matching_filter '%s' does not respect formatting convention"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1155
+#: nova/virt/xenapi/vm_utils.py:1152
 msgid ""
 "XenAPI is unable to find a Storage Repository to install guest instances "
 "on. Please check your configuration and/or configure the flag "
 "'sr_matching_filter'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1168
+#: nova/virt/xenapi/vm_utils.py:1165
 msgid "Cannot find SR of content-type ISO"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1176
+#: nova/virt/xenapi/vm_utils.py:1173
 #, python-format
 msgid "ISO: looking at SR %(sr_rec)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1178
+#: nova/virt/xenapi/vm_utils.py:1175
 msgid "ISO: not iso content"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1181
+#: nova/virt/xenapi/vm_utils.py:1178
 msgid "ISO: iso content_type, no 'i18n-key' key"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1184
+#: nova/virt/xenapi/vm_utils.py:1181
 msgid "ISO: iso content_type, i18n-key value not 'local-storage-iso'"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1188
+#: nova/virt/xenapi/vm_utils.py:1185
 msgid "ISO: SR MATCHing our criteria"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1190
+#: nova/virt/xenapi/vm_utils.py:1187
 msgid "ISO: ISO, looking to see if it is host local"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1193
+#: nova/virt/xenapi/vm_utils.py:1190
 #, python-format
 msgid "ISO: PBD %(pbd_ref)s disappeared"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1196
+#: nova/virt/xenapi/vm_utils.py:1193
 #, python-format
 msgid "ISO: PBD matching, want %(pbd_rec)s, have %(host)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1199
+#: nova/virt/xenapi/vm_utils.py:1196
 msgid "ISO: SR with local PBD"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1221
+#: nova/virt/xenapi/vm_utils.py:1218
 #, python-format
 msgid ""
 "Unable to obtain RRD XML for VM %(vm_uuid)s with server details: "
 "%(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1237
+#: nova/virt/xenapi/vm_utils.py:1234
 #, python-format
 msgid "Unable to obtain RRD XML updates with server details: %(server)s."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1291
+#: nova/virt/xenapi/vm_utils.py:1288
 #, python-format
 msgid "Invalid statistics data from Xenserver: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1344
+#: nova/virt/xenapi/vm_utils.py:1341
 #, python-format
 msgid "VHD %(vdi_uuid)s has parent %(parent_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1418
+#: nova/virt/xenapi/vm_utils.py:1415
 #, python-format
 msgid ""
 "Parent %(parent_uuid)s doesn't match original parent "
 "%(original_parent_uuid)s, waiting for coalesce..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1428
+#: nova/virt/xenapi/vm_utils.py:1425
 #, python-format
 msgid "VHD coalesce attempts exceeded (%(max_attempts)d), giving up..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1463
+#: nova/virt/xenapi/vm_utils.py:1460
 #, python-format
 msgid "Timeout waiting for device %s to be created"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1474
+#: nova/virt/xenapi/vm_utils.py:1480
+#, python-format
+msgid "Disconnecting stale VDI %s from compute domU"
+msgstr ""
+
+#: nova/virt/xenapi/vm_utils.py:1494
 #, python-format
 msgid "Plugging VBD %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1477
+#: nova/virt/xenapi/vm_utils.py:1497
 #, python-format
 msgid "Plugging VBD %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1479
+#: nova/virt/xenapi/vm_utils.py:1499
 #, python-format
 msgid "VBD %(vbd_ref)s plugged as %(orig_dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1482
+#: nova/virt/xenapi/vm_utils.py:1502
 #, python-format
 msgid "VBD %(vbd_ref)s plugged into wrong dev, remapping to %(dev)s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1491
+#: nova/virt/xenapi/vm_utils.py:1507
 #, python-format
 msgid "Destroying VBD for VDI %s ... "
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1499
+#: nova/virt/xenapi/vm_utils.py:1515
 #, python-format
 msgid "Destroying VBD for VDI %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1512
+#: nova/virt/xenapi/vm_utils.py:1528
 #, python-format
 msgid "Running pygrub against %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1519
+#: nova/virt/xenapi/vm_utils.py:1535
 #, python-format
 msgid "Found Xen kernel %s"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1521
+#: nova/virt/xenapi/vm_utils.py:1537
 msgid "No Xen kernel found.  Booting HVM."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1534
+#: nova/virt/xenapi/vm_utils.py:1550
 msgid "Partitions:"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1540
+#: nova/virt/xenapi/vm_utils.py:1556
 #, python-format
 msgid "  %(num)s: %(ptype)s %(size)d sectors"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1566
+#: nova/virt/xenapi/vm_utils.py:1582
 #, python-format
 msgid ""
 "Writing partition table %(primary_first)d %(primary_last)d to "
 "%(dev_path)s..."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1579
+#: nova/virt/xenapi/vm_utils.py:1595
 #, python-format
 msgid "Writing partition table %s done."
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1633
+#: nova/virt/xenapi/vm_utils.py:1649
 #, python-format
 msgid ""
 "Starting sparse_copy src=%(src_path)s dst=%(dst_path)s "
 "virtual_size=%(virtual_size)d block_size=%(block_size)d"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1665
+#: nova/virt/xenapi/vm_utils.py:1681
 #, python-format
 msgid ""
 "Finished sparse_copy in %(duration).2f secs, %(compression_pct).2f%% "
 "reduction in size"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1715
+#: nova/virt/xenapi/vm_utils.py:1731
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1723
+#: nova/virt/xenapi/vm_utils.py:1739
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1727
+#: nova/virt/xenapi/vm_utils.py:1743
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1743
+#: nova/virt/xenapi/vm_utils.py:1759
 msgid "Manipulating interface files directly"
 msgstr ""
 
-#: nova/virt/xenapi/vm_utils.py:1752
+#: nova/virt/xenapi/vm_utils.py:1768
 #, python-format
 msgid "Failed to mount filesystem (expected for non-linux instances): %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:688
+#: nova/virt/xenapi/vm_utils.py:1834
+msgid "This domU must be running on the host specified by xenapi_connection_url"
+msgstr ""
+
+#: nova/virt/xenapi/vmops.py:131 nova/virt/xenapi/vmops.py:687
 #, python-format
 msgid "Updating progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:229
+#: nova/virt/xenapi/vmops.py:228
 msgid "Starting instance"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:298
+#: nova/virt/xenapi/vmops.py:297
 msgid "Removing kernel/ramdisk files from dom0"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:353
+#: nova/virt/xenapi/vmops.py:352
 msgid "Failed to spawn, rolling back"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:434
+#: nova/virt/xenapi/vmops.py:433
 msgid "Detected ISO image type, creating blank VM for install"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:453
+#: nova/virt/xenapi/vmops.py:452
 msgid "Auto configuring disk, attempting to resize partition..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:498
+#: nova/virt/xenapi/vmops.py:497
 msgid "Starting VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:505
+#: nova/virt/xenapi/vmops.py:504
 #, python-format
 msgid ""
 "Latest agent build for %(hypervisor)s/%(os)s/%(architecture)s is "
 "%(version)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:508
+#: nova/virt/xenapi/vmops.py:507
 #, python-format
 msgid "No agent build found for %(hypervisor)s/%(os)s/%(architecture)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:515
+#: nova/virt/xenapi/vmops.py:514
 msgid "Waiting for instance state to become running"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:527
+#: nova/virt/xenapi/vmops.py:526
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:530
+#: nova/virt/xenapi/vmops.py:529
 #, python-format
 msgid "Instance agent version: %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:535
+#: nova/virt/xenapi/vmops.py:534
 #, python-format
 msgid "Updating Agent to %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:552
+#: nova/virt/xenapi/vmops.py:551
 #, python-format
 msgid "Invalid value for injected_files: %r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:557
+#: nova/virt/xenapi/vmops.py:556
 #, python-format
 msgid "Injecting file path: '%s'"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:564
+#: nova/virt/xenapi/vmops.py:563
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:568
+#: nova/virt/xenapi/vmops.py:567
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:575
+#: nova/virt/xenapi/vmops.py:574
 msgid "Setting VCPU weight"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:582
-msgid "Could not find VM by name"
+#: nova/virt/xenapi/vmops.py:581
+#, python-format
+msgid "Could not find VM with name %s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:636
+#: nova/virt/xenapi/vmops.py:635
 msgid "Finished snapshot and upload for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:643
+#: nova/virt/xenapi/vmops.py:642
 msgid "Starting snapshot for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:652
+#: nova/virt/xenapi/vmops.py:651
 #, fuzzy, python-format
 msgid "Unable to Snapshot instance: %(exc)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/xenapi/vmops.py:668
+#: nova/virt/xenapi/vmops.py:667
 msgid "Failed to transfer vhd to new host"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:736
+#: nova/virt/xenapi/vmops.py:735
 #, python-format
 msgid "Resizing down VDI %(cow_uuid)s from %(old_gb)dGB to %(new_gb)dGB"
 msgstr ""
@@ -6521,39 +6510,39 @@ msgstr ""
 msgid "Failed to inject file: %(resp)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:996
+#: nova/virt/xenapi/vmops.py:997
 msgid "VM already halted, skipping shutdown..."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1000
+#: nova/virt/xenapi/vmops.py:1001
 msgid "Shutting down VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1017
+#: nova/virt/xenapi/vmops.py:1018
 msgid "Unable to find VBD for VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1060
+#: nova/virt/xenapi/vmops.py:1061
 msgid "Using RAW or VHD, skipping kernel and ramdisk deletion"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1067
+#: nova/virt/xenapi/vmops.py:1068
 msgid "instance has a kernel or ramdisk but not both"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1074
+#: nova/virt/xenapi/vmops.py:1075
 msgid "kernel/ramdisk files removed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1084
+#: nova/virt/xenapi/vmops.py:1085
 msgid "VM destroyed"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1110
+#: nova/virt/xenapi/vmops.py:1111
 msgid "Destroying VM"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1135
+#: nova/virt/xenapi/vmops.py:1136
 msgid "VM is not present, skipping destroy..."
 msgstr ""
 
@@ -6571,88 +6560,88 @@ msgstr ""
 msgid "Automatically hard rebooting"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1329
+#: nova/virt/xenapi/vmops.py:1327
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1340
+#: nova/virt/xenapi/vmops.py:1338
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1345
+#: nova/virt/xenapi/vmops.py:1343
 #, python-format
 msgid "Instance %(instance_uuid)s not found"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1349
+#: nova/virt/xenapi/vmops.py:1347
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1355
+#: nova/virt/xenapi/vmops.py:1353
 #, python-format
 msgid "In %(task_state)s task_state, not RESIZE_VERIFY"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1362
+#: nova/virt/xenapi/vmops.py:1360
 #, python-format
 msgid "Error auto-confirming resize: %(e)s. Will retry later."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1384
+#: nova/virt/xenapi/vmops.py:1382
 msgid "Could not get bandwidth info."
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1431
+#: nova/virt/xenapi/vmops.py:1429
 msgid "Injecting network info to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1446
+#: nova/virt/xenapi/vmops.py:1444
 msgid "Creating vifs"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1455
+#: nova/virt/xenapi/vmops.py:1453
 #, python-format
 msgid "Creating VIF for network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1458
+#: nova/virt/xenapi/vmops.py:1456
 #, python-format
 msgid "Created VIF %(vif_ref)s, network %(network_ref)s"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1481
+#: nova/virt/xenapi/vmops.py:1479
 msgid "Injecting hostname to xenstore"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1506
+#: nova/virt/xenapi/vmops.py:1504
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "path=%(path)s; args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1527
+#: nova/virt/xenapi/vmops.py:1525
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1531
+#: nova/virt/xenapi/vmops.py:1529
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1536
+#: nova/virt/xenapi/vmops.py:1534
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/vmops.py:1622
+#: nova/virt/xenapi/vmops.py:1620
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -6685,7 +6674,7 @@ msgid "introducing sr within volume_utils"
 msgstr ""
 
 #: nova/virt/xenapi/volume_utils.py:103 nova/virt/xenapi/volume_utils.py:170
-#: nova/virt/xenapi/volumeops.py:156
+#: nova/virt/xenapi/volumeops.py:153
 #, python-format
 msgid "Introduced %(label)s as %(sr_ref)s."
 msgstr ""
@@ -6698,11 +6687,11 @@ msgstr ""
 msgid "Plugging SR"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:160
+#: nova/virt/xenapi/volume_utils.py:116 nova/virt/xenapi/volumeops.py:157
 msgid "Unable to introduce Storage Repository"
 msgstr ""
 
-#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:50
+#: nova/virt/xenapi/volume_utils.py:127 nova/virt/xenapi/volumeops.py:47
 msgid "Unable to get SR using uuid"
 msgstr ""
 
@@ -6770,101 +6759,101 @@ msgstr ""
 msgid "Mountpoint cannot be translated: %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:64
+#: nova/virt/xenapi/volumeops.py:61
 msgid "Could not find VDI ref"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:69
+#: nova/virt/xenapi/volumeops.py:66
 #, python-format
 msgid "Creating SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:73
+#: nova/virt/xenapi/volumeops.py:70
 msgid "Could not create SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:76
+#: nova/virt/xenapi/volumeops.py:73
 msgid "Could not retrieve SR record"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:81
+#: nova/virt/xenapi/volumeops.py:78
 #, python-format
 msgid "Introducing SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:85
+#: nova/virt/xenapi/volumeops.py:82
 msgid "SR found in xapi database. No need to introduce"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:90
+#: nova/virt/xenapi/volumeops.py:87
 msgid "Could not introduce SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:94
+#: nova/virt/xenapi/volumeops.py:91
 #, python-format
 msgid "Checking for SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:106
+#: nova/virt/xenapi/volumeops.py:103
 #, python-format
 msgid "SR %s not found in the xapi database"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:112
+#: nova/virt/xenapi/volumeops.py:109
 msgid "Could not forget SR"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:121
+#: nova/virt/xenapi/volumeops.py:118
 #, python-format
 msgid "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:178
+#: nova/virt/xenapi/volumeops.py:175
 #, python-format
 msgid "Unable to create VDI on SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "無法替 instance實例 %(instance_name)s , 建立 VDI 在SR %(sr_ref)s"
 
-#: nova/virt/xenapi/volumeops.py:189
+#: nova/virt/xenapi/volumeops.py:186
 #, python-format
 msgid "Unable to use SR %(sr_ref)s for instance %(instance_name)s"
 msgstr "無法替 instance實例 %(instance_name)s ,  使用SR %(sr_ref)s"
 
-#: nova/virt/xenapi/volumeops.py:197
+#: nova/virt/xenapi/volumeops.py:194
 #, python-format
 msgid "Unable to attach volume to instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/xenapi/volumeops.py:200
+#: nova/virt/xenapi/volumeops.py:197
 #, python-format
 msgid "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/virt/xenapi/volumeops.py:210
+#: nova/virt/xenapi/volumeops.py:207
 #, python-format
 msgid "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgstr "卸載_Volume: %(instance_name)s, %(mountpoint)s"
 
-#: nova/virt/xenapi/volumeops.py:219
+#: nova/virt/xenapi/volumeops.py:216
 #, python-format
 msgid "Unable to locate volume %s"
 msgstr "找不到Volume %s"
 
-#: nova/virt/xenapi/volumeops.py:227
+#: nova/virt/xenapi/volumeops.py:224
 #, python-format
 msgid "Unable to detach volume %s"
 msgstr "無法卸載 Volume %s"
 
-#: nova/virt/xenapi/volumeops.py:232
+#: nova/virt/xenapi/volumeops.py:229
 #, python-format
 msgid "Unable to destroy vbd %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:239
+#: nova/virt/xenapi/volumeops.py:236
 #, python-format
 msgid "Error purging SR %s"
 msgstr ""
 
-#: nova/virt/xenapi/volumeops.py:241
+#: nova/virt/xenapi/volumeops.py:238
 #, python-format
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 從虛擬機器 %(instance_name)s 卸載"
@@ -7001,117 +6990,117 @@ msgstr ""
 msgid "Sheepdog is not working: %s"
 msgstr ""
 
-#: nova/volume/driver.py:581
+#: nova/volume/driver.py:582
 msgid "Sheepdog is not working"
 msgstr ""
 
-#: nova/volume/driver.py:680 nova/volume/driver.py:685
+#: nova/volume/driver.py:681 nova/volume/driver.py:686
 #, python-format
 msgid "LoggingVolumeDriver: %s"
 msgstr ""
 
-#: nova/volume/manager.py:96
+#: nova/volume/manager.py:98
 #, python-format
 msgid "Re-exporting %s volumes"
 msgstr ""
 
-#: nova/volume/manager.py:101
+#: nova/volume/manager.py:103
 #, python-format
 msgid "volume %s: skipping export"
 msgstr ""
 
-#: nova/volume/manager.py:107
+#: nova/volume/manager.py:109
 #, python-format
 msgid "volume %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:119
+#: nova/volume/manager.py:121
 #, python-format
 msgid "volume %(vol_name)s: creating lv of size %(vol_size)sG"
 msgstr ""
 
-#: nova/volume/manager.py:131
+#: nova/volume/manager.py:133
 #, python-format
 msgid "volume %s: creating export"
 msgstr ""
 
-#: nova/volume/manager.py:144
+#: nova/volume/manager.py:146
 #, python-format
 msgid "volume %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:153
+#: nova/volume/manager.py:155
 msgid "Volume is still attached"
 msgstr ""
 
-#: nova/volume/manager.py:155
+#: nova/volume/manager.py:157
 msgid "Volume is not local to this node"
 msgstr ""
 
-#: nova/volume/manager.py:159
+#: nova/volume/manager.py:162
 #, python-format
 msgid "volume %s: removing export"
 msgstr ""
 
-#: nova/volume/manager.py:161
+#: nova/volume/manager.py:164
 #, python-format
 msgid "volume %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:164
+#: nova/volume/manager.py:167
 #, python-format
 msgid "volume %s: volume is busy"
 msgstr ""
 
-#: nova/volume/manager.py:176
+#: nova/volume/manager.py:179
 #, python-format
 msgid "volume %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:183
+#: nova/volume/manager.py:186
 #, python-format
 msgid "snapshot %s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:187
+#: nova/volume/manager.py:190
 #, python-format
 msgid "snapshot %(snap_name)s: creating"
 msgstr ""
 
-#: nova/volume/manager.py:202
+#: nova/volume/manager.py:205
 #, python-format
 msgid "snapshot %s: created successfully"
 msgstr ""
 
-#: nova/volume/manager.py:211
+#: nova/volume/manager.py:214
 #, python-format
 msgid "snapshot %s: deleting"
 msgstr ""
 
-#: nova/volume/manager.py:214
+#: nova/volume/manager.py:217
 #, python-format
 msgid "snapshot %s: snapshot is busy"
 msgstr ""
 
-#: nova/volume/manager.py:226
+#: nova/volume/manager.py:229
 #, python-format
 msgid "snapshot %s: deleted successfully"
 msgstr ""
 
-#: nova/volume/manager.py:310
+#: nova/volume/manager.py:319
 msgid "Checking volume capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:314
+#: nova/volume/manager.py:323
 #, python-format
 msgid "New capabilities found: %s"
 msgstr ""
 
-#: nova/volume/manager.py:325
+#: nova/volume/manager.py:334
 msgid "Clear capabilities"
 msgstr ""
 
-#: nova/volume/manager.py:329
+#: nova/volume/manager.py:338
 #, python-format
 msgid "Notification {%s} received"
 msgstr ""
@@ -7139,144 +7128,144 @@ msgstr ""
 msgid "Failed to provision dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:252
+#: nova/volume/netapp.py:253
 msgid "No LUN was created by the provision job"
 msgstr ""
 
-#: nova/volume/netapp.py:261 nova/volume/netapp.py:433
+#: nova/volume/netapp.py:263 nova/volume/netapp.py:435
 #, fuzzy, python-format
 msgid "Failed to find LUN ID for volume %s"
 msgstr "找不到Volume %s"
 
-#: nova/volume/netapp.py:280
+#: nova/volume/netapp.py:282
 msgid "Failed to remove and delete dataset member"
 msgstr ""
 
-#: nova/volume/netapp.py:603 nova/volume/netapp.py:657
+#: nova/volume/netapp.py:605 nova/volume/netapp.py:659
 #, fuzzy, python-format
 msgid "No LUN ID for volume %s"
 msgstr "找不到Volume %s"
 
-#: nova/volume/netapp.py:607 nova/volume/netapp.py:661
+#: nova/volume/netapp.py:609 nova/volume/netapp.py:663
 #, python-format
 msgid "Failed to get LUN details for LUN ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:614
+#: nova/volume/netapp.py:616
 #, python-format
 msgid "Failed to get host details for host ID %s"
 msgstr ""
 
-#: nova/volume/netapp.py:620
+#: nova/volume/netapp.py:622
 #, python-format
 msgid "Failed to get target portal for filer: %s"
 msgstr ""
 
-#: nova/volume/netapp.py:625
+#: nova/volume/netapp.py:627
 #, python-format
 msgid "Failed to get target IQN for filer: %s"
 msgstr ""
 
-#: nova/volume/san.py:113 nova/volume/san.py:151
+#: nova/volume/san.py:114 nova/volume/san.py:153
 msgid "Specify san_password or san_private_key"
 msgstr ""
 
-#: nova/volume/san.py:156
+#: nova/volume/san.py:158
 msgid "san_ip must be set"
 msgstr ""
 
-#: nova/volume/san.py:320
+#: nova/volume/san.py:229
+#, python-format
+msgid "Cannot parse list-view output: %s"
+msgstr ""
+
+#: nova/volume/san.py:323
 #, python-format
 msgid "LUID not found for %(zfs_poolname)s. Output=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:452
+#: nova/volume/san.py:455
 #, python-format
 msgid "CLIQ command returned %s"
 msgstr ""
 
-#: nova/volume/san.py:458
+#: nova/volume/san.py:461
 #, python-format
 msgid "Malformed response to CLIQ command %(verb)s %(cliq_args)s. Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:466
+#: nova/volume/san.py:469
 #, python-format
 msgid "Error running CLIQ command %(verb)s %(cliq_args)s.  Result=%(out)s"
 msgstr ""
 
-#: nova/volume/san.py:496
+#: nova/volume/san.py:499
 #, python-format
 msgid ""
 "Unexpected number of virtual ips for cluster  %(cluster_name)s. "
 "Result=%(_xml)s"
 msgstr ""
 
-#: nova/volume/san.py:549
+#: nova/volume/san.py:552
 #, python-format
 msgid "Volume info: %(volume_name)s => %(volume_attributes)s"
 msgstr ""
 
-#: nova/volume/san.py:594
+#: nova/volume/san.py:605
 msgid "local_path not supported"
 msgstr ""
 
-#: nova/volume/san.py:626
-#, python-format
-msgid "Could not determine project for volume %s, can't export"
-msgstr ""
-
-#: nova/volume/san.py:696
+#: nova/volume/san.py:688
 #, python-format
 msgid "Payload for SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:713
+#: nova/volume/san.py:705
 #, python-format
 msgid "Call to json.loads() raised an exception: %s"
 msgstr ""
 
-#: nova/volume/san.py:718
+#: nova/volume/san.py:710
 #, python-format
 msgid "Results of SolidFire API call: %s"
 msgstr ""
 
-#: nova/volume/san.py:732
+#: nova/volume/san.py:724
 #, python-format
 msgid "Found solidfire account: %s"
 msgstr ""
 
-#: nova/volume/san.py:746
+#: nova/volume/san.py:738
 #, python-format
 msgid "solidfire account: %s does not exist, create it..."
 msgstr ""
 
-#: nova/volume/san.py:804
+#: nova/volume/san.py:796
 msgid "Enter SolidFire create_volume..."
 msgstr ""
 
-#: nova/volume/san.py:846
+#: nova/volume/san.py:838
 msgid "Leaving SolidFire create_volume"
 msgstr ""
 
-#: nova/volume/san.py:861
+#: nova/volume/san.py:853
 msgid "Enter SolidFire delete_volume..."
 msgstr ""
 
-#: nova/volume/san.py:880
+#: nova/volume/san.py:872
 #, python-format
 msgid "Deleting volumeID: %s"
 msgstr ""
 
-#: nova/volume/san.py:888
+#: nova/volume/san.py:880
 msgid "Leaving SolidFire delete_volume"
 msgstr ""
 
-#: nova/volume/san.py:891
+#: nova/volume/san.py:883
 msgid "Executing SolidFire ensure_export..."
 msgstr ""
 
-#: nova/volume/san.py:895
+#: nova/volume/san.py:887
 msgid "Executing SolidFire create_export..."
 msgstr ""
 
@@ -7330,36 +7319,36 @@ msgstr ""
 msgid "XenSMDriver requires xenapi connection"
 msgstr ""
 
-#: nova/volume/xensm.py:110
+#: nova/volume/xensm.py:111
 msgid "Failed to initiate session"
 msgstr ""
 
-#: nova/volume/xensm.py:142
+#: nova/volume/xensm.py:143
 #, python-format
 msgid "Volume will be created in backend - %d"
 msgstr ""
 
-#: nova/volume/xensm.py:154
+#: nova/volume/xensm.py:155
 msgid "Failed to update volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:157
+#: nova/volume/xensm.py:159
 msgid "Unable to create volume"
 msgstr ""
 
-#: nova/volume/xensm.py:171
+#: nova/volume/xensm.py:173
 msgid "Failed to delete vdi"
 msgstr ""
 
-#: nova/volume/xensm.py:177
+#: nova/volume/xensm.py:179
 msgid "Failed to delete volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:210
+#: nova/volume/xensm.py:212
 msgid "Failed to find volume in db"
 msgstr ""
 
-#: nova/volume/xensm.py:221
+#: nova/volume/xensm.py:223
 msgid "Failed to find backend in db"
 msgstr ""
 
@@ -7440,6 +7429,9 @@ msgid ""
 "gone: %(exc)s"
 msgstr ""
 
+#~ msgid "Volume service is unavailable at this time."
+#~ msgstr ""
+
 #~ msgid "Unable to locate account %(account_name) on Solidfire device"
 #~ msgstr ""
 
@@ -7461,6 +7453,9 @@ msgstr ""
 #~ msgid "Detected existing vlan with id %(vlan)"
 #~ msgstr ""
 
+#~ msgid "Inner Exception: %s"
+#~ msgstr ""
+
 #~ msgid ""
 #~ "Attempting to grab semaphore \"%(lock)s\" "
 #~ "for method \"%(method)s\"...lock"
@@ -7477,6 +7472,9 @@ msgstr ""
 #~ msgid "Got file lock \"%(lock)s\" for method \"%(method)s\"...lock"
 #~ msgstr ""
 
+#~ msgid "Original exception being dropped"
+#~ msgstr ""
+
 #~ msgid "Stopping raw TCP server."
 #~ msgstr ""
 
@@ -7489,12 +7487,39 @@ msgstr ""
 #~ msgid "Returned non-serializeable type: %s"
 #~ msgstr ""
 
+#~ msgid "%(user_id)s could not be found with token '%(token)s'"
+#~ msgstr ""
+
+#~ msgid "%(user_id)s must be an admin or a member of %(project_id)s"
+#~ msgstr ""
+
+#~ msgid "Authentication requests must be made against a version root (e.g. /v2)."
+#~ msgstr ""
+
+#~ msgid "Could not find %s in request."
+#~ msgstr ""
+
+#~ msgid "Successfully authenticated '%s'"
+#~ msgstr ""
+
+#~ msgid "User not found with provided API key."
+#~ msgstr ""
+
+#~ msgid "Provided API key is valid, but not for user '%(username)s'"
+#~ msgstr ""
+
 #~ msgid "Associate floating ip failed"
 #~ msgstr ""
 
 #~ msgid "Parent group id and group id cannot be same"
 #~ msgstr ""
 
+#~ msgid "start instance %r"
+#~ msgstr ""
+
+#~ msgid "stop instance %r"
+#~ msgstr ""
+
 #~ msgid "No body provided"
 #~ msgstr ""
 
@@ -7543,6 +7568,9 @@ msgstr ""
 #~ msgid "Index instances for VSA %s"
 #~ msgstr ""
 
+#~ msgid "Quota exceeded for %(pid)s, metadata property key or value too long"
+#~ msgstr ""
+
 #~ msgid "Quota exceeded for %(pid)s, tried to run %(min_count)s instances"
 #~ msgstr ""
 
@@ -7636,6 +7664,73 @@ msgstr ""
 #~ msgstr ""
 
 #~ msgid ""
+#~ "trying to inject a file into a "
+#~ "non-running instance: %(instance_uuid)s "
+#~ "(state: %(current_power_state)s expected: "
+#~ "%(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: injecting file to %(path)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "trying to update agent on a "
+#~ "non-running instance: %(instance_uuid)s (state:"
+#~ " %(current_power_state)s expected: %(expected_state)s)"
+#~ msgstr ""
+
+#~ msgid "instance %(instance_uuid)s: updating agent to %(url)s"
+#~ msgstr ""
+
+#~ msgid "instance %s: rescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unrescuing"
+#~ msgstr ""
+
+#~ msgid "instance %s: migrating"
+#~ msgstr ""
+
+#~ msgid "instance %s: pausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: unpausing"
+#~ msgstr ""
+
+#~ msgid "instance %s: retrieving diagnostics"
+#~ msgstr ""
+
+#~ msgid "instance %s: suspending"
+#~ msgstr ""
+
+#~ msgid "instance %s: resuming"
+#~ msgstr ""
+
+#~ msgid "instance %s: locking"
+#~ msgstr ""
+
+#~ msgid "instance %s: unlocking"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting locked state"
+#~ msgstr ""
+
+#~ msgid "instance %s: reset network"
+#~ msgstr ""
+
+#~ msgid "instance %s: inject network info"
+#~ msgstr ""
+
+#~ msgid "instance %s: getting vnc console"
+#~ msgstr ""
+
+#~ msgid "Attach failed %(mountpoint)s, removing"
+#~ msgstr ""
+
+#~ msgid "Detaching volume from unknown instance %s"
+#~ msgstr ""
+
+#~ msgid ""
 #~ "Instance %(name)s found in database but"
 #~ " not known by hypervisor. Setting "
 #~ "power state to NOSTATE"
@@ -7653,15 +7748,62 @@ msgstr ""
 #~ "DELETED but still present on host."
 #~ msgstr ""
 
+#~ msgid "python-migrate is not installed. Exiting."
+#~ msgstr ""
+
 #~ msgid "SQL connection failed (%(connstring)s). %(attempts)d attempts left."
 #~ msgstr ""
 
+#~ msgid "interface column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "VIF column not added to fixed_ips table"
+#~ msgstr ""
+
+#~ msgid "join list for moving mac_addresses |%s|"
+#~ msgstr ""
+
 #~ msgid "Can't downgrade without losing data"
 #~ msgstr ""
 
+#~ msgid "foreign key constraint couldn't be added"
+#~ msgstr ""
+
+#~ msgid "foreign key constraint couldn't be dropped"
+#~ msgstr ""
+
+#~ msgid "priority column not added to networks table"
+#~ msgstr ""
+
+#~ msgid "progress column not added to instances table"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Could not cast flavorid to integer: "
+#~ "%s. Set flavorid to an integer-"
+#~ "like string to downgrade."
+#~ msgstr ""
+
+#~ msgid "instance_info_caches tables not dropped"
+#~ msgstr ""
+
+#~ msgid "progress column not added to compute_nodes table"
+#~ msgstr ""
+
+#~ msgid "dns_domains table not dropped"
+#~ msgstr ""
+
 #~ msgid "Instance %(instance_id)s not found"
 #~ msgstr ""
 
+#~ msgid ""
+#~ "instance-dns-zone is |%(domain)s|, which"
+#~ " is in availability zone |%(zone)s|. "
+#~ "Instance |%(instance)s| is in zone "
+#~ "|%(zone2)s|. No DNS record will be "
+#~ "created."
+#~ msgstr ""
+
 #~ msgid "Network %s has active ports, cannot delete"
 #~ msgstr ""
 
@@ -7855,6 +7997,12 @@ msgstr ""
 #~ msgid "Test: Volume get: id=%(volume_id)s"
 #~ msgstr ""
 
+#~ msgid "Attempted to unfilter instance %s which is not filtered"
+#~ msgstr ""
+
+#~ msgid "Filters added to instance %s"
+#~ msgstr ""
+
 #~ msgid "Task [%(name)s] %(task)s status: success    %(result)s"
 #~ msgstr ""
 
@@ -7869,6 +8017,9 @@ msgstr ""
 #~ "node_id = %(id)s node_ip = %(ip)s"
 #~ msgstr ""
 
+#~ msgid "no partitions found"
+#~ msgstr ""
+
 #~ msgid "virsh said: %r"
 #~ msgstr ""
 
@@ -7883,12 +8034,21 @@ msgstr ""
 #~ ":%s "
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting migrate_disk_and_power_off"
+#~ msgstr ""
+
 #~ msgid "During wait running, %s disappeared."
 #~ msgstr ""
 
 #~ msgid "Instance %s running successfully."
 #~ msgstr ""
 
+#~ msgid "Instance %s: Starting finish_migration"
+#~ msgstr ""
+
+#~ msgid "Instance %s: Starting finish_revert_migration"
+#~ msgstr ""
+
 #~ msgid "The nwfilter(%(instance_secgroup_filter_name)s) is not found."
 #~ msgstr ""
 
@@ -7927,6 +8087,105 @@ msgstr ""
 #~ msgid "%(container_format)s-%(id)s (%(base_file)s): image is in use"
 #~ msgstr ""
 
+#~ msgid "Failed while unplugging vif of instance '%s'"
+#~ msgstr ""
+
+#~ msgid "Property %(attr)s not set for the managed object %(objName)s"
+#~ msgstr ""
+
+#~ msgid "Creating VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Created VM with the name %s on the ESX  host"
+#~ msgstr ""
+
+#~ msgid "Reconfiguring VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Reconfigured VM instance %s to attach the image disk"
+#~ msgstr ""
+
+#~ msgid "Powering on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Powered on the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Creating Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Created Snapshot of the VM instance %s "
+#~ msgstr ""
+
+#~ msgid "Copying disk data before snapshot of the VM  instance %s"
+#~ msgstr ""
+
+#~ msgid "Copied disk data before snapshot of the VM instance %s"
+#~ msgstr ""
+
+#~ msgid "Rebooting guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Rebooted guest OS of VM %s"
+#~ msgstr ""
+
+#~ msgid "Doing hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "Did hard reboot of VM %s"
+#~ msgstr ""
+
+#~ msgid "instance - %s not present"
+#~ msgstr ""
+
+#~ msgid "Powering off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Powered off the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistering the VM %s"
+#~ msgstr ""
+
+#~ msgid "Unregistered the VM %s"
+#~ msgstr ""
+
+#~ msgid "Deleting contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Deleted contents of the VM %(name)s from datastore %(datastore_name)s"
+#~ msgstr ""
+
+#~ msgid "Suspending the VM %s "
+#~ msgstr ""
+
+#~ msgid "Suspended the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "VM %s was already in suspended "
+#~ "state. So returning without doing "
+#~ "anything"
+#~ msgstr ""
+
+#~ msgid "Resuming the VM %s"
+#~ msgstr ""
+
+#~ msgid "Resumed the VM %s "
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfiguring VM instance %(name)s to "
+#~ "set the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Reconfigured VM instance %(name)s to set"
+#~ " the machine id with ip - "
+#~ "%(ip_addr)s"
+#~ msgstr ""
+
 #~ msgid "Created VM %s..."
 #~ msgstr ""
 
@@ -7965,6 +8224,12 @@ msgstr ""
 #~ msgid "instance %s: Failed to fetch glance image"
 #~ msgstr ""
 
+#~ msgid "(VM_UTILS) xenserver vm state -> |%s|"
+#~ msgstr ""
+
+#~ msgid "(VM_UTILS) xenapi power_state -> |%s|"
+#~ msgstr ""
+
 #~ msgid "Creating VBD for VDI %s ... "
 #~ msgstr ""
 
@@ -8165,6 +8430,9 @@ msgstr ""
 #~ msgid "Failed to retrieve QoS info"
 #~ msgstr ""
 
+#~ msgid "Could not determine project for volume %s, can't export"
+#~ msgstr ""
+
 #~ msgid "Deleting volumeID: %s "
 #~ msgstr ""